X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29149a64916d6fdc53e445adca9ef83bc58fb6c3..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/bmpbuttn.h diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index 92eda41c8c..0454769f06 100644 --- a/include/wx/gtk1/bmpbuttn.h +++ b/include/wx/gtk1/bmpbuttn.h @@ -11,7 +11,7 @@ #ifndef __BMPBUTTONH__ #define __BMPBUTTONH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -22,7 +22,8 @@ class wxBitmapButton: public wxBitmapButtonBase { public: - wxBitmapButton(); + wxBitmapButton() { Init(); } + wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -32,8 +33,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { + Init(); + Create(parent, id, bitmap, pos, size, style, validator, name); } + bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -43,13 +47,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetDefault(); - virtual bool Enable(bool enable = TRUE); - void SetLabel( const wxString &label ); wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } + virtual void SetDefault(); + virtual bool Enable(bool enable = TRUE); + // implementation // -------------- @@ -59,12 +63,14 @@ public: void EndSelect(); void ApplyWidgetStyle(); - bool m_hasFocus; - bool m_isSelected; + bool m_hasFocus:1; + bool m_isSelected:1; protected: virtual void OnSetBitmap(); + void Init(); + private: DECLARE_DYNAMIC_CLASS(wxBitmapButton) };