X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5a2b6fe96bb791c685c671f348d2710e4a4ab4..f2a1b1bd23ef03bcfb17c7d2894f4982d8553709:/include/wx/bmpbuttn.h

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index b5597d0b71..2c4d1d7767 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -19,7 +19,7 @@
 #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.
@@ -44,16 +44,20 @@ public:
         { m_bmpFocus = focus; OnSetBitmap(); };
     void SetBitmapDisabled(const wxBitmap& disabled)
         { m_bmpDisabled = disabled; OnSetBitmap(); };
+    void SetBitmapHover(const wxBitmap& hover)
+        { m_bmpHover = hover; OnSetBitmap(); }
 
     // retrieve the bitmaps
     const wxBitmap& GetBitmapLabel() const { return m_bmpNormal; }
     const wxBitmap& GetBitmapSelected() const { return m_bmpSelected; }
     const wxBitmap& GetBitmapFocus() const { return m_bmpFocus; }
     const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; }
+    const wxBitmap& GetBitmapHover() const { return m_bmpHover; }
     wxBitmap& GetBitmapLabel() { return m_bmpNormal; }
     wxBitmap& GetBitmapSelected() { return m_bmpSelected; }
     wxBitmap& GetBitmapFocus() { return m_bmpFocus; }
     wxBitmap& GetBitmapDisabled() { return m_bmpDisabled; }
+    wxBitmap& GetBitmapHover() { return m_bmpHover; }
 
     // set/get the margins around the button
     virtual void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
@@ -63,11 +67,10 @@ public:
     // deprecated synonym for SetBitmapLabel()
 #if WXWIN_COMPATIBILITY_2_6
     wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) );
-        { SetBitmapLabel(bitmap); }
 
     // prevent virtual function hiding
     virtual void SetLabel(const wxString& label)
-        { wxWindowBase::SetLabel(label); }
+        { wxWindow::SetLabel(label); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
@@ -78,7 +81,8 @@ protected:
     wxBitmap m_bmpNormal,
              m_bmpSelected,
              m_bmpFocus,
-             m_bmpDisabled;
+             m_bmpDisabled,
+             m_bmpHover;
 
     // the margins around the bitmap
     int m_marginX,
@@ -89,7 +93,10 @@ protected:
 };
 
 #if WXWIN_COMPATIBILITY_2_6
-    inline void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); }
+inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
+{
+    SetBitmapLabel(bitmap);
+}
 #endif // WXWIN_COMPATIBILITY_2_6
 
 #if defined(__WXUNIVERSAL__)
@@ -98,8 +105,10 @@ protected:
     #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/bmpbuttn.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/bmpbuttn.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXCOCOA__)