X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index d1fe53738a..61a5428e20 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -6,7 +6,7 @@ // Created: 25.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BMPBUTTON_H_BASE_ @@ -19,7 +19,7 @@ #include "wx/bitmap.h" #include "wx/button.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. @@ -61,13 +61,9 @@ public: int GetMarginX() const { return m_marginX; } int GetMarginY() const { return m_marginY; } - virtual void ApplyParentThemeBackground(const wxColour& bg) - { SetBackgroundColour(bg); } - - protected: // function called when any of the bitmaps changes - virtual void OnSetBitmap() { } + virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); } // the bitmaps for various states wxBitmap m_bmpNormal,