fix MSVC /Wp64 warnings

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index b5597d0b71c5c6abba8c2a29e12d3cf56e0a9f55..21412bf42581833353a0ccc5e4c3e1be015270b6 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -19,14 +19,14 @@
 #include "wx/bitmap.h"
 #include "wx/button.h"
 
 #include "wx/bitmap.h"
 #include "wx/button.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapButtonBase : public wxButton
+class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton

 {
 public:
     wxBitmapButtonBase()
 {
 public:
     wxBitmapButtonBase()


@@ -36,24 +36,28 @@ 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)
-        { m_bmpSelected = sel; OnSetBitmap(); };
-    void SetBitmapFocus(const wxBitmap& focus)
-        { m_bmpFocus = focus; OnSetBitmap(); };
-    void SetBitmapDisabled(const wxBitmap& disabled)
-        { m_bmpDisabled = disabled; OnSetBitmap(); };
+    virtual void SetBitmapSelected(const wxBitmap& sel)
+        { m_bmpSelected = sel; OnSetBitmap(); }
+    virtual void SetBitmapFocus(const wxBitmap& focus)
+        { m_bmpFocus = focus; OnSetBitmap(); }
+    virtual void SetBitmapDisabled(const wxBitmap& disabled)
+        { m_bmpDisabled = disabled; OnSetBitmap(); }
+    virtual 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; }
 
     // 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& 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; }
 
     // 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) );
     // 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)
 
     // 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:


@@ -78,7 +81,8 @@ protected:
     wxBitmap m_bmpNormal,
              m_bmpSelected,
              m_bmpFocus,
     wxBitmap m_bmpNormal,
              m_bmpSelected,
              m_bmpFocus,

-             m_bmpDisabled;
+             m_bmpDisabled,
+             m_bmpHover;

 
     // the margins around the bitmap
     int m_marginX,
 
     // the margins around the bitmap
     int m_marginX,


@@ -89,7 +93,10 @@ protected:
 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #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__)
 #endif // WXWIN_COMPATIBILITY_2_6
 
 #if defined(__WXUNIVERSAL__)


@@ -98,14 +105,18 @@ protected:
     #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__)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #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