projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use wxUSE_LONGLONG_NATIVE more
[wxWidgets.git]
/
include
/
wx
/
gtk
/
tglbtn.h
diff --git
a/include/wx/gtk/tglbtn.h
b/include/wx/gtk/tglbtn.h
index 50d981942abda254249a719f0df00c3736904321..38ae24ee7d2314e707e21a49cb4380bc81df5c66 100644
(file)
--- a/
include/wx/gtk/tglbtn.h
+++ b/
include/wx/gtk/tglbtn.h
@@
-19,25
+19,25
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxToggleButton;
-class WXDLLIMPEXP_CORE wxToggleBitmapButton;
+class WXDLLIMPEXP_
FWD_
CORE wxToggleButton;
+class WXDLLIMPEXP_
FWD_
CORE wxToggleBitmapButton;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-extern WXDLLIMPEXP_CORE const
wxC
har wxCheckBoxNameStr[];
+extern WXDLLIMPEXP_CORE const
c
har wxCheckBoxNameStr[];
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// wx
ToggleBitmap
Button
+// wx
BitmapToggle
Button
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wx
ToggleBitmapButton: public wxControl
+class WXDLLIMPEXP_CORE wx
BitmapToggleButton: public wxToggleButtonBase
{
public:
// construction/destruction
{
public:
// construction/destruction
- wx
ToggleBitmap
Button() {}
- wx
ToggleBitmap
Button(wxWindow *parent,
+ wx
BitmapToggle
Button() {}
+ wx
BitmapToggle
Button(wxWindow *parent,
wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
@@
-71,25
+71,27
@@
public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation
- bool m_blockEvent;
wxBitmap m_bitmap;
void OnSetBitmap();
wxBitmap m_bitmap;
void OnSetBitmap();
- void DoApplyWidgetStyle(GtkRcStyle *style);
- bool IsOwnGtkWindow(GdkWindow *window);
- virtual void OnInternalIdle();
+protected:
+ void GTKDisableEvents();
+ void GTKEnableEvents();
+
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
+ virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+ virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
private:
private:
- DECLARE_DYNAMIC_CLASS(wx
ToggleBitmap
Button)
+ DECLARE_DYNAMIC_CLASS(wx
BitmapToggle
Button)
};
//-----------------------------------------------------------------------------
// wxToggleButton
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
// wxToggleButton
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxToggleButton: public wx
Control
+class WXDLLIMPEXP_CORE wxToggleButton: public wx
ToggleButtonBase
{
public:
// construction/destruction
{
public:
// construction/destruction
@@
-126,14
+128,13
@@
public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- // implementation
- bool m_blockEvent;
-
- void DoApplyWidgetStyle(GtkRcStyle *style);
- bool IsOwnGtkWindow(GdkWindow *window);
-
- virtual void OnInternalIdle();
+protected:
+ void GTKDisableEvents();
+ void GTKEnableEvents();
+
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
+ virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+ virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
private:
DECLARE_DYNAMIC_CLASS(wxToggleButton)
private:
DECLARE_DYNAMIC_CLASS(wxToggleButton)