Rename wxGenericImageList to wxImageList in generic wxListCtrl, too.

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 4b23b568c26d321a54d59af6ee7d8b7e379c6788..ee7a64bf0b151c06986df51fe37ec8594b497932 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -27,7 +27,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)


@@ -69,6 +72,10 @@ 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); }

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


@@ -79,8 +86,6 @@ 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(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXPM__)