added wxRegEx::GetMatchCount (patch 938995)

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index abe3cb7632123744766cd29236f22ba48fffc221..c874c9d9dabed5ef9b775c8b66b00d5e78099cc6 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -61,6 +61,10 @@ 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
     virtual void OnSetBitmap() { }
 protected:
     // function called when any of the bitmaps changes
     virtual void OnSetBitmap() { }


@@ -74,10 +78,13 @@ protected:
     // the margins around the bitmap
     int m_marginX,
         m_marginY;
     // the margins around the bitmap
     int m_marginX,
         m_marginY;

+

 private:
     // Prevent Virtual function hiding warnings
     void SetLabel(const wxString& rsLabel)
 private:
     // Prevent Virtual function hiding warnings
     void SetLabel(const wxString& rsLabel)

-    { wxWindowBase::SetLabel(rsLabel); }
+        { wxWindowBase::SetLabel(rsLabel); }
+
+    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)