X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd507486e07b742bb7acb118811efd60ee027859..f6840be66eb772c08f0cbb43de677509d5d132bb:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 6827496a50..442369808c 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,11 +61,13 @@ public: int GetMarginX() const { return m_marginX; } int GetMarginY() const { return m_marginY; } - virtual bool CanApplyParentThemeBackground() const { return true; } + 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,