more extra semicolons removed (patch 1303724)

[wxWidgets.git] / include / wx / bmpbuttn.h

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index c874c9d9dabed5ef9b775c8b66b00d5e78099cc6..61a5428e2081ff4d132b4d88c766e21401b29a1a 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -19,7 +19,7 @@
 #include "wx/bitmap.h"
 #include "wx/button.h"
 
 #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.
 
 // ----------------------------------------------------------------------------
 // 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; }
 
     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
 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,
 
     // the bitmaps for various states
     wxBitmap m_bmpNormal,