diff --git a/lcl/include/intfbaselcl.inc b/lcl/include/intfbaselcl.inc index 9e5e2b91fb..c958f80c68 100644 --- a/lcl/include/intfbaselcl.inc +++ b/lcl/include/intfbaselcl.inc @@ -620,20 +620,6 @@ begin Result := false; end; -procedure TWidgetSet.StatusBarPanelUpdate(StatusBar: TObject; - PanelIndex: integer); -begin -end; - -procedure TWidgetSet.StatusBarSetText(StatusBar: TObject; - PanelIndex: integer); -begin -end; - -procedure TWidgetSet.StatusBarUpdate(StatusBar: TObject); -begin -end; - function TWidgetSet.StretchMaskBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc, SrcWidth, SrcHeight: Integer; @@ -646,6 +632,9 @@ end; { ============================================================================= $Log$ + Revision 1.31 2004/10/23 14:47:44 micha + remove old code: statusbar methods in twidgetset + Revision 1.30 2004/09/04 22:24:16 mattias added default values for compiler skip options and improved many parts of synedit for UTF8 diff --git a/lcl/include/lclintfh.inc b/lcl/include/lclintfh.inc index a6b4900e7a..7d16e9e80a 100644 --- a/lcl/include/lclintfh.inc +++ b/lcl/include/lclintfh.inc @@ -115,12 +115,6 @@ procedure SendCachedLCLMessages; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function DrawSplitter(DC: HDC; const ARect: TRect; Horizontal: boolean): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetCaretRespondToFocus(handle: HWND; ShowHideOnFocus: boolean): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetComboMinDropDownSize(Handle: HWND; MinItemsWidth, MinItemsHeight, MinItemCount: integer): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} -{$IFDEF IF_BASE_MEMBER} -{ TODO: remove when gtk widgetset implements the widgetset methods } -procedure StatusBarPanelUpdate(StatusBar: TObject; PanelIndex: integer); virtual; -procedure StatusBarSetText(StatusBar: TObject; PanelIndex: integer); virtual; -procedure StatusBarUpdate(StatusBar: TObject); virtual; -{$ENDIF} function StretchMaskBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc, SrcWidth, SrcHeight: Integer; Mask: HBITMAP; XMask, YMask: Integer; Rop: DWORD): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} //##apiwiz##eps## // Do not remove @@ -157,6 +151,9 @@ procedure RaiseLastOSError; { ============================================================================= $Log$ + Revision 1.28 2004/10/23 14:47:44 micha + remove old code: statusbar methods in twidgetset + Revision 1.27 2004/10/16 10:15:45 micha cleanup statusbar methods in lcl interfaceobject fix statusbar recursive call issue diff --git a/lcl/interfaces/gtk/gtklclintf.inc b/lcl/interfaces/gtk/gtklclintf.inc index 3486709a6c..29ed3c8afe 100644 --- a/lcl/interfaces/gtk/gtklclintf.inc +++ b/lcl/interfaces/gtk/gtklclintf.inc @@ -500,66 +500,14 @@ begin DeleteObject(NewMask); end; -{------------------------------------------------------------------------------ - Procedure: StatusBarPanelUpdate - Params: StatusBar: - index: - Returns: Nothing - - ------------------------------------------------------------------------------} -procedure TGtkWidgetSet.StatusBarPanelUpdate(StatusBar: TObject; Index: integer); -var - AStatusBar: TStatusBar; - HBox: PGtkWidget; - StatusPanelWidget: PGtkWidget; - BoxChild: PGtkBoxChild; -begin - //DebugLn('TGtkWidgetSet.StatusBarPanelUpdate ',HexStr(Cardinal(StatusBar),8),' Index=',dbgs(Index)); - AStatusBar:=StatusBar as TStatusBar; - if Index>=0 then begin - // update one - HBox:=PGtkWidget(AStatusBar.Handle); - BoxChild:=PGtkBoxChild(g_list_nth_data(PGtkBox(HBox)^.children,Index)); - if BoxChild=nil then - RaiseGDBException('TGtkWidgetSet.StatusBarPanelUpdate Index out of bounds'); - StatusPanelWidget:=BoxChild^.Widget; - UpdateStatusBarPanel(StatusBar,Index,StatusPanelWidget); - end else begin - // update all - UpdateStatusBarPanels(StatusBar,PGtkWidget(AStatusBar.Handle)); - end; -end; - -{------------------------------------------------------------------------------ - Procedure: StatusBarSetText - Params: StatusBar: - PanelIndex: - Text: - Returns: Nothing - - ------------------------------------------------------------------------------} -procedure TGtkWidgetSet.StatusBarSetText(StatusBar: TObject; PanelIndex: integer); -begin - StatusBarPanelUpdate(StatusBar,PanelIndex); -end; - -{------------------------------------------------------------------------------ - Procedure: StatusBarUpdate - Params: StatusBar: - Returns: Nothing - - ------------------------------------------------------------------------------} -procedure TGtkWidgetSet.StatusBarUpdate(StatusBar: TObject); -begin - //DebugLn('TGtkWidgetSet.StatusBarUpdate ',HexStr(Cardinal(StatusBar),8)); - UpdateStatusBarPanels(StatusBar,PGtkWidget((StatusBar as TStatusBar).Handle)); -end; - //##apiwiz##eps## // Do not remove, no wizard declaration after this line { ============================================================================= $Log$ + Revision 1.34 2004/10/23 14:47:44 micha + remove old code: statusbar methods in twidgetset + Revision 1.33 2004/09/12 18:55:13 mazen * Fix font retreiving from Pango description diff --git a/lcl/interfaces/gtk/gtklclintfh.inc b/lcl/interfaces/gtk/gtklclintfh.inc index 04c290c152..a832644cc7 100644 --- a/lcl/interfaces/gtk/gtklclintfh.inc +++ b/lcl/interfaces/gtk/gtklclintfh.inc @@ -51,15 +51,14 @@ function MenuItemSetEnable(BaseMenuItem: TComponent): Boolean; override; function ReplaceBitmapMask(var Image, Mask: HBitmap; NewMask: HBitmap): boolean; override; -procedure StatusBarPanelUpdate(StatusBar: TObject; Index: integer); override; -procedure StatusBarSetText(StatusBar: TObject; PanelIndex: integer); override; -procedure StatusBarUpdate(StatusBar: TObject); override; - //##apiwiz##eps## // Do not remove, no wizard declaration after this line { ============================================================================= $Log$ + Revision 1.21 2004/10/23 14:47:44 micha + remove old code: statusbar methods in twidgetset + Revision 1.20 2004/09/10 16:28:51 mattias implemented very rudimentary TTabControl diff --git a/lcl/widgetset/wscomctrls.pp b/lcl/widgetset/wscomctrls.pp index fc199f2b6d..d386941296 100644 --- a/lcl/widgetset/wscomctrls.pp +++ b/lcl/widgetset/wscomctrls.pp @@ -48,9 +48,7 @@ uses ComCtrls, Controls, //////////////////////////////////////////////////// WSLCLClasses, WSControls, WSExtCtrls, WSStdCtrls, - WSToolwin, - { TODO: to be removed when statusbar widget methods cleaned } - InterfaceBase; + WSToolwin; type { TWSStatusBar } @@ -168,20 +166,14 @@ implementation procedure TWSStatusBar.PanelUpdate(const AStatusBar: TStatusBar; PanelIndex: integer); begin - { TODO: remove when gtk interface adapted to use widgetset method } - InterfaceObject.StatusBarPanelUpdate(AStatusBar, PanelIndex); end; procedure TWSStatusBar.SetPanelText(const AStatusBar: TStatusBar; PanelIndex: integer); begin - { TODO: remove when gtk interface adapted to use widgetset method } - InterfaceObject.StatusBarSetText(AStatusBar, PanelIndex); end; procedure TWSStatusBar.Update(const AStatusBar: TStatusBar); begin - { TODO: remove when gtk interface adapted to use widgetset method } - InterfaceObject.StatusBarUpdate(AStatusBar); end; { TWSCustomListView }