Added wchar handling for EMX (gcc on OS/2).

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 4b23b568c26d321a54d59af6ee7d8b7e379c6788..884796042a14c03ea49cf34c05014df17af4205a 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -69,6 +69,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 +83,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__)