Changeset 39 for trunk/LocalPlayer

Timestamp:

Jan 9, 2017, 7:58:25 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Retyping from pointer to integer doesn't work on 64-bit architecture.
• Fixed: Do not use CreateWindowEx for scrollbar under Linux.
• Fixed: Warning about unintialized record fields.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (1 diff)
• PVSB.pas (modified) (5 diffs)

trunk/LocalPlayer/Help.pas

@@ -41 +41 @@
 
   THyperText = class(TStringList)
+  public
     procedure AddLine(s: String = ''; Format: integer = 0; Picpix: integer = 0;
       LinkCategory: integer = 0; LinkIndex: integer = 0);

trunk/LocalPlayer/PVSB.pas

@@ -8 +8 @@
   Windows,
   {$ENDIF}
-  LCLIntf, LCLType, LMessages, Messages, SysUtils;
+  Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils;
 
 type
   TPVScrollbar = record
     h: integer;
-    si: TScrollInfo end;
+    si: TScrollInfo;
+    Form: TForm;
+  end;
 
-    procedure CreatePVSB(var sb: TPVScrollbar; Handle, y0, x1, y1: integer);
-    procedure InitPVSB(var sb: TPVScrollbar; max, Page: integer);
-    function ProcessPVSB(var sb: TPVScrollbar; const m: TMessage): boolean;
-    function ProcessMouseWheel(var sb: TPVScrollbar; const m: TMessage)
-      : boolean;
-    procedure ShowPVSB(var sb: TPVScrollbar; Visible: boolean);
-    procedure EndPVSB(var sb: TPVScrollbar);
+  procedure CreatePVSB(var sb: TPVScrollbar; Handle, y0, x1, y1: integer);
+  procedure InitPVSB(var sb: TPVScrollbar; max, Page: integer);
+  function ProcessPVSB(var sb: TPVScrollbar; const m: TMessage): boolean;
+  function ProcessMouseWheel(var sb: TPVScrollbar; const m: TMessage)
+    : boolean;
+  procedure ShowPVSB(var sb: TPVScrollbar; Visible: boolean);
+  procedure EndPVSB(var sb: TPVScrollbar);
 
 implementation
@@ -28 +30 @@
   Count: integer = 0;
 
-procedure CreatePVSB;
+procedure CreatePVSB(var sb: TPVScrollbar; Handle, y0, x1, y1: integer);
 begin
   inc(Count);
+  {$IFDEF LINUX}
+  sb.Form := TForm.Create(nil);
+  sb.h := sb.Form.Handle;
+  {$ENDIF}
   {$IFDEF WINDOWS}
   sb.h := CreateWindowEx(0, 'SCROLLBAR', pchar('PVSB' + IntToStr(Count)),
@@ -39 +45 @@
 end;
 
-procedure InitPVSB;
+procedure InitPVSB(var sb: TPVScrollbar; max, Page: integer);
 begin
   {$IFDEF WINDOWS}
@@ -58 +64 @@
 end;
 
-function ProcessPVSB;
+function ProcessPVSB(var sb: TPVScrollbar; const m: TMessage): Boolean;
 var
   NewPos: integer;
@@ -101 +107 @@
 end;
 
-function ProcessMouseWheel;
+function ProcessMouseWheel(var sb: TPVScrollbar; const m: TMessage): Boolean;
 var
   NewPos: integer;