From 5302d4b562e50504fea602f5a8a8df3de5b49f96 Mon Sep 17 00:00:00 2001 From: andrew Date: Sat, 18 Nov 2006 13:45:28 +0000 Subject: [PATCH] changed lazarus to use the widgetset it is compiled with as the default when building projects + added WidgetSetName function to TWidgetSet. + changed the order of units on qtint and fpguiint git-svn-id: trunk@10216 - --- ide/include/unix/lazbaseconf.inc | 5 ----- ide/include/win32/lazconf.inc | 5 ----- ide/include/win64/lazconf.inc | 5 ----- ide/lazconf.pp | 7 ++++++- lcl/include/interfacebase.inc | 6 ++++++ lcl/interfacebase.pp | 2 ++ lcl/interfaces/carbon/carbonint.pas | 1 + lcl/interfaces/carbon/carbonobject.inc | 5 +++++ lcl/interfaces/fpgui/fpguiint.pp | 7 +++++-- lcl/interfaces/fpgui/fpguiobject.inc | 5 +++++ lcl/interfaces/gnome/gnomeint.pp | 9 +++++++++ lcl/interfaces/gtk/gtkint.pp | 1 + lcl/interfaces/gtk/gtkobject.inc | 5 +++++ lcl/interfaces/gtk2/gtk2int.pas | 3 ++- lcl/interfaces/gtk2/gtk2object.inc | 5 +++++ lcl/interfaces/qt/qtint.pp | 8 +++++--- lcl/interfaces/qt/qtobject.inc | 5 +++++ lcl/interfaces/win32/win32int.pp | 1 + lcl/interfaces/win32/win32object.inc | 5 +++++ lcl/interfaces/wince/winceint.pp | 1 + lcl/interfaces/wince/winceobject.inc | 5 +++++ 21 files changed, 74 insertions(+), 22 deletions(-) diff --git a/ide/include/unix/lazbaseconf.inc b/ide/include/unix/lazbaseconf.inc index e3598b886c..cca0436a78 100644 --- a/ide/include/unix/lazbaseconf.inc +++ b/ide/include/unix/lazbaseconf.inc @@ -178,11 +178,6 @@ begin List.Add('/var/tmp/'); end; -function GetDefaultLCLWidgetType: string; -begin - Result:='gtk'; -end; - procedure GetDefaultBrowser(var Browser, Params: string); function Find(const ShortFilename: string; var Filename: string): boolean; diff --git a/ide/include/win32/lazconf.inc b/ide/include/win32/lazconf.inc index 7025545e9a..25e2259637 100644 --- a/ide/include/win32/lazconf.inc +++ b/ide/include/win32/lazconf.inc @@ -151,11 +151,6 @@ begin List.Add('c:\windows\temp\'); end; -function GetDefaultLCLWidgetType: string; -begin - Result:='win32'; -end; - procedure GetDefaultBrowser(var Browser, Params: string); begin Browser:= SearchFileInPath('rundll32.exe','', diff --git a/ide/include/win64/lazconf.inc b/ide/include/win64/lazconf.inc index 40da27d487..691ed0dffa 100644 --- a/ide/include/win64/lazconf.inc +++ b/ide/include/win64/lazconf.inc @@ -150,11 +150,6 @@ begin List.Add('c:\windows\temp\'); end; -function GetDefaultLCLWidgetType: string; -begin - Result:='win32'; -end; - procedure GetDefaultBrowser(var Browser, Params: string); begin Browser:= SearchFileInPath('rundll32.exe','', diff --git a/ide/lazconf.pp b/ide/lazconf.pp index dbd84ec492..9eaf2e298f 100644 --- a/ide/lazconf.pp +++ b/ide/lazconf.pp @@ -46,7 +46,7 @@ interface {$endif} uses - SysUtils, Classes, FileUtil; + SysUtils, Classes, FileUtil, InterfaceBase; type TLCLPlatform = ( @@ -143,6 +143,11 @@ begin [sffDontSearchInBasePath]); end; +function GetDefaultLCLWidgetType: string; +begin + Result:=WidgetSet.WidgetSetName; +end; + function GetDefaultLCLLibPaths(const Prefix, Postfix, Separator: string): string; var List: TStringList; diff --git a/lcl/include/interfacebase.inc b/lcl/include/interfacebase.inc index a6c4faa08e..ee834203b9 100644 --- a/lcl/include/interfacebase.inc +++ b/lcl/include/interfacebase.inc @@ -46,3 +46,9 @@ procedure TWidgetSet.AppSetTitle(const ATitle: string); begin Debugln('TWidgetSet.AppSetTitle not implemented by ', ClassName); end; + +function TWidgetSet.WidgetSetName: string; +begin + Result := ''; + Debugln('TWidgetSet.WidgetSetName not implemented by ', ClassName); +end; diff --git a/lcl/interfacebase.pp b/lcl/interfacebase.pp index 8ed86ab99c..7ea7f9b3d8 100644 --- a/lcl/interfacebase.pp +++ b/lcl/interfacebase.pp @@ -67,6 +67,8 @@ type procedure AppMinimize; virtual; abstract; procedure AppBringToFront; virtual; abstract; procedure AppSetTitle(const ATitle: string); virtual; + + function WidgetSetName: string; virtual; function DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor; virtual; abstract; procedure DCSetPixel(CanvasHandle: HDC; X, Y: integer; AColor: TGraphicsColor); virtual; abstract; diff --git a/lcl/interfaces/carbon/carbonint.pas b/lcl/interfaces/carbon/carbonint.pas index e43373775a..441022cbb4 100644 --- a/lcl/interfaces/carbon/carbonint.pas +++ b/lcl/interfaces/carbon/carbonint.pas @@ -70,6 +70,7 @@ type procedure AppTerminate; override; procedure AppMinimize; override; procedure AppBringToFront; override; + function WidgetSetName: string; override; function DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor; override; procedure DCSetPixel(CanvasHandle: HDC; X, Y: integer; AColor: TGraphicsColor); override; diff --git a/lcl/interfaces/carbon/carbonobject.inc b/lcl/interfaces/carbon/carbonobject.inc index 2bf586c659..1427e225d6 100644 --- a/lcl/interfaces/carbon/carbonobject.inc +++ b/lcl/interfaces/carbon/carbonobject.inc @@ -350,6 +350,11 @@ begin end; +function TCarbonWidgetSet.WidgetSetName: string; +begin + Result:='carbon'; +end; + function TCarbonWidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer ): TGraphicsColor; begin diff --git a/lcl/interfaces/fpgui/fpguiint.pp b/lcl/interfaces/fpgui/fpguiint.pp index c47449b0e3..5d31dae807 100644 --- a/lcl/interfaces/fpgui/fpguiint.pp +++ b/lcl/interfaces/fpgui/fpguiint.pp @@ -34,10 +34,12 @@ interface {$endif} uses + // FCL + Classes, Types, SysUtils, Math, // LCL - Types, InterfaceBase, SysUtils, LCLProc, LCLType, LMessages, Classes, + InterfaceBase, LCLProc, LCLType, LMessages, Controls, ExtCtrls, Forms, Dialogs, StdCtrls, Comctrls, LCLIntf, - GraphType, Math; + GraphType; type @@ -55,6 +57,7 @@ type procedure AppMinimize; override; procedure AppBringToFront; override; // procedure AppSetTitle(const ATitle: string); override; + function WidgetSetName: string; override; public constructor Create; destructor Destroy; override; diff --git a/lcl/interfaces/fpgui/fpguiobject.inc b/lcl/interfaces/fpgui/fpguiobject.inc index a31417c539..51a8d86b51 100644 --- a/lcl/interfaces/fpgui/fpguiobject.inc +++ b/lcl/interfaces/fpgui/fpguiobject.inc @@ -145,6 +145,11 @@ begin end; +function TFpGuiWidgetSet.WidgetSetName: string; +begin + Result:='fpgui'; +end; + function TFpGuiWidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor; begin Result:=clNone; diff --git a/lcl/interfaces/gnome/gnomeint.pp b/lcl/interfaces/gnome/gnomeint.pp index 8f50281951..6ead96bcb8 100644 --- a/lcl/interfaces/gnome/gnomeint.pp +++ b/lcl/interfaces/gnome/gnomeint.pp @@ -44,6 +44,9 @@ uses libgnome, libart, libgnomeui; type + + { TGnomeWidgetSet } + TGnomeWidgetSet = class(TGtkWidgetSet) private procedure PassCmdLineOptions; override; @@ -55,6 +58,7 @@ type function CreateComponent(Sender: TObject): THandle; override; public + function WidgetSetName: string; override; {$I gnomewinapih.inc} end; @@ -289,6 +293,11 @@ begin Result:=THandle(P); end; +function TGnomeWidgetSet.WidgetSetName: string; +begin + Result:='gnome'; +end; + {$I gnomewinapi.inc} end. diff --git a/lcl/interfaces/gtk/gtkint.pp b/lcl/interfaces/gtk/gtkint.pp index 21f09762ff..c87bce0836 100644 --- a/lcl/interfaces/gtk/gtkint.pp +++ b/lcl/interfaces/gtk/gtkint.pp @@ -310,6 +310,7 @@ type procedure AppMinimize; override; procedure AppBringToFront; override; procedure AppSetTitle(const ATitle: string); override; + function WidgetSetName: string; override; public constructor Create; destructor Destroy; override; diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc index 566ef8392a..d286ee0854 100644 --- a/lcl/interfaces/gtk/gtkobject.inc +++ b/lcl/interfaces/gtk/gtkobject.inc @@ -1968,6 +1968,11 @@ begin end; +function TGTKWidgetSet.WidgetSetName: string; +begin + Result:='gtk'; +end; + {------------------------------------------------------------------------------ Method: TGtkWidgetSet.RecreateWnd Params: Sender: TObject - the lcl wincontrol, that is to recreated diff --git a/lcl/interfaces/gtk2/gtk2int.pas b/lcl/interfaces/gtk2/gtk2int.pas index 692953d741..808ec7ea85 100644 --- a/lcl/interfaces/gtk2/gtk2int.pas +++ b/lcl/interfaces/gtk2/gtk2int.pas @@ -74,7 +74,8 @@ type SelWidget: PGtkWidget); override; procedure CreatePreviewDialogControl( PreviewDialog: TPreviewFileDialog; SelWidget: PGtkWidget); override; - public + public + function WidgetSetName: string; override; {$I gtk2winapih.inc} {$I gtk2lclintfh.inc} end; diff --git a/lcl/interfaces/gtk2/gtk2object.inc b/lcl/interfaces/gtk2/gtk2object.inc index 05caa103eb..4c62eeb41b 100644 --- a/lcl/interfaces/gtk2/gtk2object.inc +++ b/lcl/interfaces/gtk2/gtk2object.inc @@ -1007,6 +1007,11 @@ begin gtk_widget_show(PreviewWidget); end; +function TGtk2WidgetSet.WidgetSetName: string; +begin + Result:='gtk2'; +end; + {$IFDEF ASSERT_IS_ON} {$UNDEF ASSERT_IS_ON} {$C-} diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index af8c540b5b..a85efc8604 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -36,10 +36,11 @@ interface uses // Bindings - qt4 must come first to avoid type redefinition problems on Windows qt4, + // FPC + Classes, SysUtils, Math, Types, // LCL - Types, InterfaceBase, SysUtils, LCLProc, LCLType, LMessages, Classes, - Controls, ExtCtrls, Forms, Dialogs, StdCtrls, Comctrls, LCLIntf, - GraphType, Math; + InterfaceBase, LCLProc, LCLType, LMessages, Controls, ExtCtrls, Forms, + Dialogs, StdCtrls, Comctrls, LCLIntf, GraphType; type @@ -58,6 +59,7 @@ type procedure AppMinimize; override; procedure AppBringToFront; override; // procedure AppSetTitle(const ATitle: string); override; + function WidgetSetName: string; override; public constructor Create; destructor Destroy; override; diff --git a/lcl/interfaces/qt/qtobject.inc b/lcl/interfaces/qt/qtobject.inc index 2adc9b9c28..f92b67324e 100644 --- a/lcl/interfaces/qt/qtobject.inc +++ b/lcl/interfaces/qt/qtobject.inc @@ -145,6 +145,11 @@ begin end; +function TQtWidgetSet.WidgetSetName: string; +begin + Result:='qt'; +end; + function TQtWidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor; {var Color: QColorH;} diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp index 03a94eb4e1..3fba140696 100644 --- a/lcl/interfaces/win32/win32int.pp +++ b/lcl/interfaces/win32/win32int.pp @@ -186,6 +186,7 @@ Type procedure AppWaitMessage; override; Procedure AppTerminate; Override; procedure AppSetTitle(const ATitle: string); override; + function WidgetSetName: string; override; Function InitHintFont(HintFont: TObject): Boolean; Override; Procedure AttachMenuToWindow(AMenuObject: TComponent); Override; diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc index 46374dd487..9846db0f3c 100644 --- a/lcl/interfaces/win32/win32object.inc +++ b/lcl/interfaces/win32/win32object.inc @@ -418,6 +418,11 @@ begin {$endif} end; +function TWin32WidgetSet.WidgetSetName: string; +begin + Result:='win32'; +end; + {------------------------------------------------------------------------------ Function: CreateTimer Params: Interval: diff --git a/lcl/interfaces/wince/winceint.pp b/lcl/interfaces/wince/winceint.pp index 77d9fa1808..6419fbe6ce 100644 --- a/lcl/interfaces/wince/winceint.pp +++ b/lcl/interfaces/wince/winceint.pp @@ -176,6 +176,7 @@ type procedure AppProcessMessages; override; procedure AppWaitMessage; override; Procedure AppTerminate; Override; + function WidgetSetName: string; override; Function InitHintFont(HintFont: TObject): Boolean; override; Procedure AttachMenuToWindow(AMenuObject: TComponent); override; procedure AppRun(const ALoop: TApplicationMainLoop); override; diff --git a/lcl/interfaces/wince/winceobject.inc b/lcl/interfaces/wince/winceobject.inc index ae8917a7dc..aa80f42cbf 100644 --- a/lcl/interfaces/wince/winceobject.inc +++ b/lcl/interfaces/wince/winceobject.inc @@ -301,6 +301,11 @@ begin PostQuitMessage(0); end; +function TWinCEWidgetSet.WidgetSetName: string; +begin + Result:='wince'; +end; + function TWinCEWidgetSet.InitHintFont(HintFont: TObject): Boolean; begin