X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/gtk1/bmpbuttn.h diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index 0454769f06..da79870b6c 100644 --- a/include/wx/gtk1/bmpbuttn.h +++ b/include/wx/gtk1/bmpbuttn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bmpbutton.h +// Name: wx/gtk1/bmpbutton.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,15 +11,11 @@ #ifndef __BMPBUTTONH__ #define __BMPBUTTONH__ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - // ---------------------------------------------------------------------------- // wxBitmapButton // ---------------------------------------------------------------------------- -class wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: wxBitmapButton() { Init(); } @@ -48,10 +44,8 @@ public: const wxString& name = wxButtonNameStr); 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 @@ -61,13 +55,14 @@ public: void NotFocus(); void StartSelect(); void EndSelect(); - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); bool m_hasFocus:1; bool m_isSelected:1; protected: virtual void OnSetBitmap(); + virtual wxSize DoGetBestSize() const; void Init();