X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29149a64916d6fdc53e445adca9ef83bc58fb6c3..7fb02ea7d6cb8dea608badcb8a1e2649ee4edd48:/include/wx/gtk/bmpbuttn.h diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index 92eda41c8c..68fe9bb8a4 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -11,18 +11,15 @@ #ifndef __BMPBUTTONH__ #define __BMPBUTTONH__ -#ifdef __GNUG__ -#pragma interface -#endif - // ---------------------------------------------------------------------------- // wxBitmapButton // ---------------------------------------------------------------------------- -class wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: - wxBitmapButton(); + wxBitmapButton() { Init(); } + wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -32,8 +29,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 +43,11 @@ 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 bool Enable(bool enable = TRUE); + // implementation // -------------- @@ -57,13 +55,16 @@ public: void NotFocus(); void StartSelect(); void EndSelect(); - void ApplyWidgetStyle(); - bool m_hasFocus; - bool m_isSelected; + bool m_hasFocus:1; + bool m_isSelected:1; protected: virtual void OnSetBitmap(); + virtual wxSize DoGetBestSize() const; + void DoApplyWidgetStyle(GtkRcStyle *style); + + void Init(); private: DECLARE_DYNAMIC_CLASS(wxBitmapButton)