X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..de1b0aeb6ca71f915479d07e040b1d65e5096951:/include/wx/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 54a38c4322..61a5428e20 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -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() { InvalidateBestSize(); } + virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); } // the bitmaps for various states wxBitmap m_bmpNormal,