gtk2: removed OldCreateStatusBarPanel

git-svn-id: trunk@36789 -

lcl/interfaces/gtk2/gtk2int.pas

@@ -154,7 +154,6 @@ type
 
     // create and destroy
     function CreateAPIWidget(AWinControl: TWinControl): PGtkWidget;
-    function OldCreateStatusBarPanel(StatusBar: TObject; Index: integer): PGtkWidget;
     function CreateSimpleClientAreaWidget(Sender: TObject;
       NotOnParentsClientArea: boolean): PGtkWidget;
     procedure DestroyEmptySubmenu(Sender: TObject);
@@ -218,7 +217,7 @@ type
     // misc
     function GetCaption(Sender : TObject) : String;
     procedure WordWrap(DC: HDC; AText: PChar; MaxWidthInPixel: integer;
-      var Lines: PPChar; var LineCount: integer);
+      out Lines: PPChar; out LineCount: integer);
 
     procedure ResizeChild(Sender : TObject; Left,Top,Width,Height : Integer);
     procedure RemoveCallbacks(Widget: PGtkWidget);

lcl/interfaces/gtk2/gtk2widgetset.inc

@@ -4662,20 +4662,6 @@ begin
       BorderStyleShadowMap[TCustomControl(AWinControl).BorderStyle]);
 end;
 
-{------------------------------------------------------------------------------
-  function TGtk2WidgetSet.CreateStatusBarPanel(StatusBar: TObject; Index: integer
-    ): PGtkWidget;
-
-  Creates a new statusbar panel widget.
- ------------------------------------------------------------------------------}
-function TGtk2WidgetSet.OldCreateStatusBarPanel(StatusBar: TObject; Index: integer
-  ): PGtkWidget;
-begin
-  Result:=gtk_statusbar_new;
-  gtk_widget_show(Result);
-  // other properties are set in UpdateStatusBarPanels
-end;
-
 {------------------------------------------------------------------------------
   function TGtk2WidgetSet.CreateSimpleClientAreaWidget(Sender: TObject;
     NotOnParentsClientArea: boolean): PGtkWidget;
@@ -6007,7 +5993,7 @@ end;
   with FreeMem(Lines).
 ------------------------------------------------------------------------------}
 procedure TGtk2WidgetSet.WordWrap(DC: HDC; AText: PChar;
-  MaxWidthInPixel: integer; var Lines: PPChar; var LineCount: integer);
+  MaxWidthInPixel: integer; out Lines: PPChar; out LineCount: integer);
 var
   UseFont: TGtkIntfFont;
 
@@ -6097,7 +6083,11 @@ var
   CurLineEntry: PPChar;
   CurLineStart: PChar;
 begin
-  if IsEmptyText then exit;
+  if IsEmptyText then begin
+    Lines:=nil;
+    LineCount:=0;
+    exit;
+  end;
   InitFont;
   LinesList:=TFPList.Create;
   LineStart:=0;

lcl/interfaces/gtk2/gtk2winapi.inc

@@ -194,12 +194,7 @@ end;
 function TGtk2WidgetSet.CallNextHookEx(hhk : HHOOK; ncode : Integer; wParam: WParam; lParam : LParam) : Integer;
 begin
   Result := 0;
-  //TODO: Does anything need to be done here?
+  // TODO: TGtk2WidgetSet.CallNextHookEx: Does anything need to be done here?
-  //DebugLn('Trace:!!!!!!!!!!!!!!!!!!');
-  //DebugLn('Trace:!!!!!!!!!!!!!!!!!!');
-  //DebugLn('Trace:TODO: CALLNEXTHOOKEX in gtkwinapi.inc');
-  //DebugLn('Trace:!!!!!!!!!!!!!!!!!!');
-  //DebugLn('Trace:!!!!!!!!!!!!!!!!!!');
 end;
 
 {------------------------------------------------------------------------------

lcl/interfaces/gtk2/gtk2winapih.inc

@@ -1,5 +1,4 @@
 {%MainUnit gtk2int.pas}
-{ $Id$ }
 
 // included by gtk2int.pp
 
@@ -40,7 +39,7 @@ function AngleChord(DC: HDC; x1 ,y1, x2, y2, angle1, angle2: Integer): Boolean;
 function BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc; override;
 function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD): Boolean; override;
 
-function CallNextHookEx(hHk: HHOOK; ncode : Integer; wParam: WParam; lParam : LParam) : Integer; override;
+function CallNextHookEx({%H-}hHk: HHOOK; {%H-}ncode : Integer; {%H-}wParam: WParam; {%H-}lParam : LParam) : Integer; override;
 function CallWindowProc({%H-}lpPrevWndFunc : TFarProc; Handle : HWND; Msg : UINT; wParam: WParam; lParam : lParam) : Integer; override;
 function ClientToScreen(Handle : HWND; var P : TPoint) : Boolean;override;
 
@@ -61,7 +60,7 @@ function CreateBitmap(Width, Height: Integer; Planes, BitCount: Longint; BitmapB
 function CreateBrushIndirect(const LogBrush: TLogBrush): HBRUSH; override;
 function CreateCaret(Handle : HWND; Bitmap : hBitmap; width, Height : Integer) : Boolean; override;
 function CreateCompatibleBitmap(DC: HDC; Width, Height: Integer): HBITMAP; override;
-function CreateCompatibleDC(DC: HDC): HDC; override;
+function CreateCompatibleDC({%H-}DC: HDC): HDC; override;
 function CreateEllipticRgn(X1, Y1, X2, Y2: Integer): HRGN; override;
 function CreateFontIndirect(const LogFont: TLogFont): HFONT; override;
 function CreateFontIndirectEx(const LogFont: TLogFont; const LongFontName: string): HFONT; override;