Better fix

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 66fa0c6d93d59848388eb0b235b5a18c375bf88b..27edd94fd06d1a991aae5742cc89b5164b8cce4c 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 char) wxButtonNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.


@@ -36,15 +36,15 @@ public:
     }
 
     // set the bitmaps
     }
 
     // set the bitmaps

-    void SetBitmapLabel(const wxBitmap& bitmap)
+    virtual void SetBitmapLabel(const wxBitmap& bitmap)

         { m_bmpNormal = bitmap; OnSetBitmap(); }
         { m_bmpNormal = bitmap; OnSetBitmap(); }

-    void SetBitmapSelected(const wxBitmap& sel)
+    virtual void SetBitmapSelected(const wxBitmap& sel)

         { m_bmpSelected = sel; OnSetBitmap(); }
         { m_bmpSelected = sel; OnSetBitmap(); }

-    void SetBitmapFocus(const wxBitmap& focus)
+    virtual void SetBitmapFocus(const wxBitmap& focus)

         { m_bmpFocus = focus; OnSetBitmap(); }
         { m_bmpFocus = focus; OnSetBitmap(); }

-    void SetBitmapDisabled(const wxBitmap& disabled)
+    virtual void SetBitmapDisabled(const wxBitmap& disabled)

         { m_bmpDisabled = disabled; OnSetBitmap(); }
         { m_bmpDisabled = disabled; OnSetBitmap(); }

-    void SetBitmapHover(const wxBitmap& hover)
+    virtual void SetBitmapHover(const wxBitmap& hover)

         { m_bmpHover = hover; OnSetBitmap(); }
 
     // retrieve the bitmaps
         { m_bmpHover = hover; OnSetBitmap(); }
 
     // retrieve the bitmaps


@@ -115,6 +115,8 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/bmpbuttn.h"

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