diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-05-08 00:51:36 +0200 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-05-08 00:51:36 +0200 |
commit | 32f9bde6fe7c543b078090c1ade5a2c3903f3c50 (patch) | |
tree | f3b5645d74eeaafe2b38e8c4280fcb9405839cae | |
parent | c3b41ed772ef91730a8dc89a2c287da0a86fba46 (diff) | |
download | fpGUI-32f9bde6fe7c543b078090c1ade5a2c3903f3c50.tar.xz |
globally renamed TFButtonFlags to TfpgButtonFlags
Somehow I forgot to rename that type name when we moved over to the 'fpg' prefix.
-rw-r--r-- | examples/gui/customstyles/mystyle.pas | 7 | ||||
-rw-r--r-- | src/corelib/fpg_main.pas | 19 | ||||
-rw-r--r-- | src/gui/fpg_button.pas | 2 | ||||
-rw-r--r-- | src/gui/fpg_combobox.pas | 2 | ||||
-rw-r--r-- | src/gui/fpg_listview.pas | 2 |
5 files changed, 17 insertions, 15 deletions
diff --git a/examples/gui/customstyles/mystyle.pas b/examples/gui/customstyles/mystyle.pas index 8db9f2b4..665a22b0 100644 --- a/examples/gui/customstyles/mystyle.pas +++ b/examples/gui/customstyles/mystyle.pas @@ -46,8 +46,11 @@ type TMyStyle = class(TfpgStyle) public constructor Create; override; + { General } procedure DrawControlFrame(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord); override; - procedure DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); override; + { Buttons } + procedure DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); override; + { Menus } procedure DrawMenuRow(ACanvas: TfpgCanvas; r: TfpgRect; AFlags: TfpgMenuItemFlags); override; procedure DrawMenuBar(ACanvas: TfpgCanvas; r: TfpgRect; ABackgroundColor: TfpgColor); override; end; @@ -77,7 +80,7 @@ begin ACanvas.DrawRectangle(r); end; -procedure TMyStyle.DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); +procedure TMyStyle.DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); var r: TfpgRect; begin diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas index 3dd71fdf..76ae537e 100644 --- a/src/corelib/fpg_main.pas +++ b/src/corelib/fpg_main.pas @@ -42,7 +42,7 @@ type TAnchor = (anLeft, anRight, anTop, anBottom); TAnchors = set of TAnchor; - TFButtonFlags = set of (btfIsEmbedded, btfIsDefault, btfIsPressed, + TfpgButtonFlags = set of (btfIsEmbedded, btfIsDefault, btfIsPressed, btfIsSelected, btfHasFocus, btfHasParentColor, btfFlat, btfHover); TfpgMenuItemFlags = set of (mifSelected, mifHasFocus, mifSeparator, mifEnabled, mifChecked, mifSubMenu); @@ -176,8 +176,8 @@ type destructor Destroy; override; // As soon as TfpgStyle has moved out of CoreLib, these must go! - procedure DrawButtonFace(x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); overload; - procedure DrawButtonFace(r: TfpgRect; AFlags: TFButtonFlags); overload; + procedure DrawButtonFace(x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); overload; + procedure DrawButtonFace(r: TfpgRect; AFlags: TfpgButtonFlags); overload; procedure DrawControlFrame(x, y, w, h: TfpgCoord); overload; procedure DrawControlFrame(r: TfpgRect); overload; procedure DrawBevel(x, y, w, h: TfpgCoord; ARaised: Boolean = True); overload; @@ -212,8 +212,8 @@ type procedure DrawString(ACanvas: TfpgCanvas; x, y: TfpgCoord; AText: string; AEnabled: boolean = True); virtual; procedure DrawFocusRect(ACanvas: TfpgCanvas; r: TfpgRect); virtual; { Buttons } - procedure DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); virtual; overload; - procedure DrawButtonFace(ACanvas: TfpgCanvas; r: TfpgRect; AFlags: TFButtonFlags); overload; + procedure DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); virtual; overload; + procedure DrawButtonFace(ACanvas: TfpgCanvas; r: TfpgRect; AFlags: TfpgButtonFlags); overload; function GetButtonBorders: TRect; virtual; function GetButtonShift: TPoint; virtual; { Menus } @@ -1800,12 +1800,12 @@ begin inherited Destroy; end; -procedure TfpgCanvas.DrawButtonFace(x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); +procedure TfpgCanvas.DrawButtonFace(x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); begin fpgStyle.DrawButtonFace(self, x, y, w, h, AFlags); end; -procedure TfpgCanvas.DrawButtonFace(r: TfpgRect; AFlags: TFButtonFlags); +procedure TfpgCanvas.DrawButtonFace(r: TfpgRect; AFlags: TfpgButtonFlags); begin DrawButtonFace(r.Left, r.Top, r.Width, r.Height, AFlags); end; @@ -2042,7 +2042,7 @@ begin inherited Destroy; end; -procedure TfpgStyle.DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TFButtonFlags); +procedure TfpgStyle.DrawButtonFace(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; AFlags: TfpgButtonFlags); var r: TfpgRect; begin @@ -2135,8 +2135,7 @@ begin ACanvas.DrawLine(r.Right-1, r.Bottom-1, r.Left, r.Bottom-1); // bottom end; -procedure TfpgStyle.DrawButtonFace(ACanvas: TfpgCanvas; r: TfpgRect; - AFlags: TFButtonFlags); +procedure TfpgStyle.DrawButtonFace(ACanvas: TfpgCanvas; r: TfpgRect; AFlags: TfpgButtonFlags); begin DrawButtonFace(ACanvas, r.Left, r.Top, r.Width, r.Height, AFlags); end; diff --git a/src/gui/fpg_button.pas b/src/gui/fpg_button.pas index 51dedd0c..621b9e33 100644 --- a/src/gui/fpg_button.pas +++ b/src/gui/fpg_button.pas @@ -521,7 +521,7 @@ var tx, ty, ix, iy: integer; r: TfpgRect; offset: TPoint; - lBtnFlags: TFButtonFlags; + lBtnFlags: TfpgButtonFlags; clr: TfpgColor; img: TfpgImage; lTextFlags: TFTextFlags; diff --git a/src/gui/fpg_combobox.pas b/src/gui/fpg_combobox.pas index d0fc01c1..aab6923e 100644 --- a/src/gui/fpg_combobox.pas +++ b/src/gui/fpg_combobox.pas @@ -356,7 +356,7 @@ end; procedure TfpgBaseComboBox.PaintInternalButton; var ar: TfpgRect; - btnflags: TFButtonFlags; + btnflags: TfpgButtonFlags; begin Canvas.BeginDraw; btnflags := []; diff --git a/src/gui/fpg_listview.pas b/src/gui/fpg_listview.pas index c7bdba66..72164496 100644 --- a/src/gui/fpg_listview.pas +++ b/src/gui/fpg_listview.pas @@ -1446,7 +1446,7 @@ var cLeft, cTop: Integer; Column: TfpgLVColumn; - Flags: TFButtonFlags; + Flags: TfpgButtonFlags; ClipRect: TfpgRect; cRect: TfpgRect; PaintPart: TfpgLVItemPaintPart; |