X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2b4469be1759c89835d490a4ac608dd252da21d..c18353e5613042ac89a72d9762f481fb0ed6e5d2:/include/wx/gtk1/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index 473991447b..0469870587 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(NO_GCC_PRAGMA) -#pragma interface -#endif - // ---------------------------------------------------------------------------- // wxBitmapButton // ---------------------------------------------------------------------------- -class wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: wxBitmapButton() { Init(); } @@ -48,7 +44,6 @@ public: const wxString& name = wxButtonNameStr); void SetLabel( const wxString &label ); - wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } virtual void SetDefault(); @@ -68,6 +63,7 @@ public: protected: virtual void OnSetBitmap(); + virtual wxSize DoGetBestSize() const; void Init();