compatibility with new 1.1

git-svn-id: trunk@4728 -

Makefile.fpc

@@ -42,6 +42,7 @@ ifeq ($(OS_TARGET),win32)
 LCL_PLATFORM=win32
 else
 LCL_PLATFORM=gtk
+override COMPILER_UNITDIR+=lcl/nonwin32
 endif
 endif
 export LCL_PLATFORM

components/codetools/memcheck.pas

@@ -2160,12 +2160,18 @@ begin
   if (cardinal(p)>=$40000) and (p<=HeapOrg) then
     goto _exit;
   { inside stack ? }
+{$ifdef ver1_0}
   asm
      movl %ebp,get_ebp
   end;
   if (cardinal(p)>get_ebp) and
      (cardinal(p)<Win32StackTop) then
     goto _exit;
+{$else ver1_0}
+  if (p>get_frame) and
+     (p<pointer(Win32StackTop)) then
+    goto _exit;
+{$endif ver1_0}
 {$endif win32}
 
   { first try valid list faster }
@@ -2561,6 +2567,9 @@ end.
 
 {
   $Log$
+  Revision 1.23  2003/10/23 16:15:30  micha
+  compatibility with new 1.1
+
   Revision 1.22  2003/07/16 20:35:42  mattias
   accelerated TLazXPMReader
 

designer/componenttreeview.pas

@@ -58,6 +58,7 @@ type
                                                  write SetSelections;
     property PropertyEditorHook: TPropertyEditorHook
                            read FPropertyEditorHook write SetPropertyEditorHook;
+    property OnSelectionChanged;
   end;
 
 implementation

designer/propedits.pp

@@ -1739,7 +1739,11 @@ end;
 Function CallSingleFunc(s : Pointer; Address : Pointer;
   Index, IValue : Longint) : Single; assembler;
 {$asmmode att}
+  var
+     saveedi,saveesi : dword;
   asm
+     movl %edi,saveedi
+     movl %esi,saveesi
      movl S,%esi
      movl Address,%edi
      // ? Indexed Function
@@ -1752,11 +1756,17 @@ Function CallSingleFunc(s : Pointer; Address : Pointer;
      push %esi
      call %edi
      //
+     movl saveedi,%edi
+     movl saveesi,%esi
   end;
 
 Function CallDoubleFunc(s : Pointer; Address : Pointer;
   Index, IValue : Longint) : Double; assembler;
+  var
+     saveedi,saveesi : dword;
   asm
+     movl %edi,saveedi
+     movl %esi,saveesi
      movl S,%esi
      movl Address,%edi
      // ? Indexed Function
@@ -1769,11 +1779,17 @@ Function CallDoubleFunc(s : Pointer; Address : Pointer;
      push %esi
      call %edi
      //
+     movl saveedi,%edi
+     movl saveesi,%esi
   end;
 
 Function CallExtendedFunc(s : Pointer; Address : Pointer;
   Index, IValue : Longint) : Extended; assembler;
+  var
+     saveedi,saveesi : dword;
   asm
+     movl %edi,saveedi
+     movl %esi,saveesi
      movl S,%esi
      movl Address,%edi
      // ? Indexed Function
@@ -1786,6 +1802,8 @@ Function CallExtendedFunc(s : Pointer; Address : Pointer;
      push %esi
      call %edi
      //
+     movl saveedi,%edi
+     movl saveesi,%esi
   end;
 
 Function MyGetFloatProp(Instance : TObject;PropInfo : PPropInfo) : Extended;
@@ -2193,7 +2211,7 @@ begin
     ShowPrefix := True;
     WordBreak := False;
     SingleLine := True;
-    SystemFont := True;
+    SystemFont := False;
   end;
   If (pedsInComboList in AState) and not (pedsInEdit in AState)
   then begin
@@ -2235,7 +2253,8 @@ begin
     ShowPrefix := False;
     WordBreak := False;
     SingleLine := True;
-    SystemFont := true;
+    ExpandTabs := True;
+    SystemFont := False;
   end;
   ACanvas.TextRect(ARect, 2,0,GetName, Style);
 end;
@@ -2254,7 +2273,8 @@ begin
     ShowPrefix := True;
     WordBreak := False;
     SingleLine := True;
-    SystemFont := true;
+    ExpandTabs := True;
+    SystemFont := False;
   end;
   ACanvas.TextRect(ARect, 3,0,GetVisualValue, Style);
 end;

ide/main.pp

@@ -277,7 +277,7 @@ type
 
     // ObjectInspector + PropertyEditorHook events
     procedure OIOnSelectComponents(Sender: TObject);
-    procedure OIOnShowOptions(AComponent:TComponent);
+    procedure OIOnShowOptions(Sender: TObject);
     procedure OnPropHookGetMethods(TypeData:PTypeData; Proc:TGetStringProc);
     function OnPropHookMethodExists(const AMethodName:ShortString;
        TypeData: PTypeData;
@@ -912,7 +912,7 @@ begin
   TheControlSelection.AssignSelection(ObjectInspector1.Selections);
 end;
 
-procedure TMainIDE.OIOnShowOptions(AComponent: TComponent);
+procedure TMainIDE.OIOnShowOptions(Sender: TObject);
 begin
   DoShowEnvGeneralOptions(eodpObjectInspector);
 end;
@@ -9925,6 +9925,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.659  2003/10/23 16:15:29  micha
+  compatibility with new 1.1
+
   Revision 1.658  2003/10/22 17:50:16  mattias
   updated rpm scripts
 

lcl/extctrls.pp

@@ -170,7 +170,6 @@ type
     procedure ReadState(Reader: TAbstractReader); override;
     procedure ShowControl(APage: TControl); override;
     procedure UpdateTabProperties; virtual;
-    property Page[Index: Integer]: TCustomPage read GetPage;
     property ActivePageComponent: TCustomPage read GetActivePageComponent
                                               write SetActivePageComponent;
     property ActivePage: String read GetActivePage write SetActivePage
@@ -185,6 +184,7 @@ type
     function CustomPage(Index: integer): TCustomPage;
   public
     //property MultiLine: boolean read fMultiLine write SetMultiLine default false;
+    property Page[Index: Integer]: TCustomPage read GetPage;
     property PageCount: integer read GetPageCount;
     property Pages: TStrings read fAccess write SetPages;
     property PageIndex: Integer read GetPageIndex write SetPageIndex default -1;
@@ -834,6 +834,9 @@ end.
 
  {
   $Log$
+  Revision 1.82  2003/10/23 16:15:30  micha
+  compatibility with new 1.1
+
   Revision 1.81  2003/10/15 18:01:10  mattias
   implemented extract proc, check lfm and convert delphi unit
 

lcl/lcltype.pp

@@ -45,7 +45,11 @@ interface
   {$ASSERTIONS ON}
 {$endif}
 
-uses VCLGlobals, Classes;
+uses
+{$ifdef win32}
+  windows,
+{$endif win32}
+  VCLGlobals, Classes;
 
 type
   //TODO: check this against vclglobals
@@ -63,6 +67,7 @@ type
   TCriticalSection = longint;
   PCriticalSection = ^TCriticalSection;
 
+{$if defined(VER1_0) or not(defined(win32))}
   { Provided for compatibility with Windows registry ONLY }
   HKEY = Integer;
   PHKEY = ^HKEY;
@@ -76,32 +81,40 @@ type
   HICON = type LongWord;
   HCURSOR = HICON;
   Bool = LongBool;
-  pByte = ^byte;
   HGLOBAL = THAndle;
-
-  TgComponentStyle = LongInt;
-  AnsiChar = Char;  //Should be moved
-  WideChar = Char;
   Short = SmallInt;
-  THAndle = Integer;
   hwnd    = THandle;
-  TCaption = string;
-  //TMessage = Pointer;
   HMENU = type LongWord;
   HBitmap = type LongWord;
   HPalette = type LongWord;
 
   HBRUSH = type LongWord;
+{$else}
+  HKEY = Windows.HKEY;
+  PHKEY = ^HKEY;
+  HDC = Windows.HDC;
+  HHOOK = Windows.HHOOK;
+  HFONT = Windows.HFont;
+  HGDIOBJ = Windows.HGDIOBJ;
+  HPEN = Windows.HPEN;
+  HRGN = Windows.HRGN;
+  HINST = Windows.HINST;
+  HICON = Windows.HICON;
+  HCURSOR = HICON;
+  Bool = Windows.Bool;
+  HGLOBAL = Windows.HGLOBAL;
+  Short = Windows.Short;
+  hwnd    = Windows.hwnd;
+  HMENU = Windows.HMENU;
+  HBitmap = Windows.HBitmap;
+  HPalette = Windows.HPalette;
 
-  // from Delphis sysutils.pas
+  HBRUSH = Windows.HBrush;
-  PByteArray = ^TByteArray;
+{$endif}
-  TByteArray = array[0..32767] of Byte;
-  
 
 var
   hInstance :HINST;
 
-
 const
   INVALID_HANDLE_VALUE  = 0;
   MaxByte               = 255;
@@ -1864,6 +1877,9 @@ end.
 
 {
   $Log$
+  Revision 1.45  2003/10/23 16:15:30  micha
+  compatibility with new 1.1
+
   Revision 1.44  2003/10/16 23:54:27  marc
   Implemented new gtk keyevent handling
 

lcl/lmessages.pp

@@ -29,7 +29,13 @@ unit lMessages;
 
 interface
 
-uses Classes, SysUtils, vclGlobals, LCLType, GraphType;
+uses Classes, SysUtils, vclGlobals, LCLType, GraphType
+{$ifdef win32}
+{$ifndef ver1_0}
+,messages
+{$endif ver1_0}
+{$endif win32}
+;
 
 const
   //-------------
@@ -388,11 +394,15 @@ type
     Result : LongInt;
   end;
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMNoParams = record
     Msg: Cardinal;
     Unused: array[0..3] of Word;
     Result: Longint;
   end;
+{$else}
+  TLMNoParams = TWMNoParams;
+{$endif}
 
   TLMScreenInit = record
     PixelsPerInchX : Integer;
@@ -400,6 +410,7 @@ type
     ColorDepth : Integer;
   end;
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMSETCURSOR = record
     Msg : Cardinal;
     CursorWnd : HWND;
@@ -407,6 +418,9 @@ type
     MouseMsg : Word;
     Result : Longint;
   end;
+{$else}
+  TLMSetCursor = TWMSetCursor;
+{$endif}
 
   PLMScreenInit = ^TLMScreenInit;
 
@@ -486,7 +500,6 @@ type
   TLMSysKeyUp = TLMKey;
 
 
-
   TLMMouse = packed record
      Msg : Cardinal;
      Keys : LongInt;
@@ -733,6 +746,7 @@ type
     PixColor : TGraphicsColor;
   end;
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMSize = packed record
     Msg: Cardinal;
     SizeType: LongInt; // see LCLType.pp (e.g. Size_Restored)
@@ -740,12 +754,16 @@ type
     Height : Word;
     Result : LongInt;
   End;
+{$else}
+  TLMSize = TWMSize;
+{$endif}
 
   TLMNoPara = packed record
     Msg : Cardinal;
   end;
 
   PLMessage = ^TLMessage;
+{$if defined(ver1_0) or not(defined(win32))}
   TLMessage = packed record
     Msg : Cardinal;
     case Integer of
@@ -761,10 +779,14 @@ type
       	ResultLo: Word;
       	ResultHi: Word);
     end;
+{$else}
+  TLMessage = TMessage;
+{$endif}
 
   TLMEnter = TLMNoPara;
   TLMExit  = TLMNoPara;
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMScroll = record
     Msg : Cardinal;
     ScrollCode : SmallInt; // SB_xxx
@@ -775,20 +797,33 @@ type
 
   TLMHScroll = TLMScroll;
   TLMVScroll = TLMScroll;
+{$else}
+  TLMScroll = TWMScroll;
+  TLMHScroll = TWMScroll;
+  TLMVScroll = TWMScroll;
+{$endif}
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMShowWindow = record
     Msg: Cardinal;
     Show: LongBool;
     Status: Longint;
     Result: Longint;
   end;
+{$else}
+  TLMShowWindow = TWMShowWindow;
+{$endif}
 
+{$if defined(ver1_0) or not(defined(win32))}
   TLMKILLFOCUS = packed Record
      Msg : Cardinal;
      FocusedWnd: HWND;
      UnUsed : LongInt;
      Result : LongInt;
     End;
+{$else}
+  TLMKillFocus = TWMKillFocus;
+{$endif}
 
   TLMNCHITTEST = packed record
     Msg : cardinal;
@@ -1057,6 +1092,9 @@ end.
 
 {
   $Log$
+  Revision 1.55  2003/10/23 16:15:30  micha
+  compatibility with new 1.1
+
   Revision 1.54  2003/10/16 23:54:27  marc
   Implemented new gtk keyevent handling