added wxGetCCDefaultFont() returning the default icon font

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 4b23b568c26d321a54d59af6ee7d8b7e379c6788..c874c9d9dabed5ef9b775c8b66b00d5e78099cc6 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -12,6 +12,8 @@
 #ifndef _WX_BMPBUTTON_H_BASE_
 #define _WX_BMPBUTTON_H_BASE_
 
 #ifndef _WX_BMPBUTTON_H_BASE_
 #define _WX_BMPBUTTON_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_BMPBUTTON
 
 #include "wx/bitmap.h"
 #if wxUSE_BMPBUTTON
 
 #include "wx/bitmap.h"


@@ -27,7 +29,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 class WXDLLEXPORT wxBitmapButtonBase : public wxButton
 {
 public:
 class WXDLLEXPORT wxBitmapButtonBase : public wxButton
 {
 public:

-    wxBitmapButtonBase() { m_marginX = m_marginY = 0; }
+    wxBitmapButtonBase()
+        : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled()
+        , m_marginX(0), m_marginY(0)
+        { }

 
     // set the bitmaps
     void SetBitmapLabel(const wxBitmap& bitmap)
 
     // set the bitmaps
     void SetBitmapLabel(const wxBitmap& bitmap)


@@ -56,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() { }


@@ -69,6 +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)
+        { wxWindowBase::SetLabel(rsLabel); }
+
+    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)

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


@@ -79,14 +95,12 @@ protected:
     #include "wx/motif/bmpbuttn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/bmpbuttn.h"
     #include "wx/motif/bmpbuttn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/bmpbuttn.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/bmpbuttn.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/bmpbuttn.h"

 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/bmpbuttn.h"

 #endif
 
 #endif // wxUSE_BMPBUTTON
 #endif
 
 #endif // wxUSE_BMPBUTTON