added wxMenu::AppendSubMenu() to avoid having to specify a dummy id when adding a...

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 6f912b376b29c0dab067739dd3464045061adb90..2c4d1d7767e97d8d0fcb02a9ad7703fe2dd1a426 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"
 

-extern WXDLLEXPORT_DATA(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.


@@ -70,7 +70,7 @@ public:
 
     // prevent virtual function hiding
     virtual void SetLabel(const wxString& label)
 
     // prevent virtual function hiding
     virtual void SetLabel(const wxString& label)

-        { wxWindowBase::SetLabel(label); }
+        { wxWindow::SetLabel(label); }

 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:


@@ -105,8 +105,10 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
     #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/bmpbuttn.h"
     #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/bmpbuttn.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/bmpbuttn.h"
     #include "wx/gtk/bmpbuttn.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/bmpbuttn.h"

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