X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2352862a7ee8440fdc2ae65baff31b73e40179d5..508bd1654f3eb44327fb84ecd2e2181959dac13b:/include/wx/bmpbuttn.h?ds=sidebyside

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 0c369003e0..5da4cb724b 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/bmpbutton.h
+// Name:        wx/bmpbuttn.h
 // Purpose:     wxBitmapButton class interface
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -16,10 +16,14 @@
 
 #if wxUSE_BMPBUTTON
 
-#include "wx/bitmap.h"
 #include "wx/button.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
+// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
+//        itself, this shouldn't be used for the other platforms neither
+//        when all of them do it
+#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
+    #define wxHAS_BUTTON_BITMAP
+#endif
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
@@ -31,18 +35,48 @@ class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton
 public:
     wxBitmapButtonBase()
     {
+#ifndef wxHAS_BUTTON_BITMAP
         m_marginX =
         m_marginY = 0;
+#endif // wxHAS_BUTTON_BITMAP
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID winid,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                const wxString& name)
+    {
+        // We use wxBU_NOTEXT to let the base class Create() know that we are
+        // not going to show the label: this is a hack needed for wxGTK where
+        // we can show both label and bitmap only with GTK 2.6+ but we always
+        // can show just one of them and this style allows us to choose which
+        // one we need.
+        //
+        // And we also use wxBU_EXACTFIT to avoid being resized up to the
+        // standard button size as this doesn't make sense for bitmap buttons
+        // which are not standard anyhow and should fit their bitmap size.
+        return wxButton::Create(parent, winid, "",
+                                pos, size,
+                                style | wxBU_NOTEXT | wxBU_EXACTFIT,
+                                validator, name);
     }
 
     // set/get the margins around the button
-    virtual void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
-    int GetMarginX() const { return m_marginX; }
-    int GetMarginY() const { return m_marginY; }
+    virtual void SetMargins(int x, int y)
+    {
+        DoSetBitmapMargins(x, y);
+    }
+
+    int GetMarginX() const { return DoGetBitmapMargins().x; }
+    int GetMarginY() const { return DoGetBitmapMargins().y; }
 
     // deprecated synonym for SetBitmapLabel()
 #if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) );
+    wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
+       SetBitmapLabel(bitmap); )
 
     // prevent virtual function hiding
     virtual void SetLabel(const wxString& label)
@@ -50,6 +84,7 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
+#ifndef wxHAS_BUTTON_BITMAP
     // function called when any of the bitmaps changes
     virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); }
 
@@ -57,24 +92,28 @@ protected:
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which)
         { m_bitmaps[which] = bitmap; OnSetBitmap(); }
 
+    virtual wxSize DoGetBitmapMargins() const
+    {
+        return wxSize(m_marginX, m_marginY);
+    }
+
+    virtual void DoSetBitmapMargins(int x, int y)
+    {
+        m_marginX = x;
+        m_marginY = y;
+    }
+
     // the bitmaps for various states
     wxBitmap m_bitmaps[State_Max];
 
     // the margins around the bitmap
     int m_marginX,
         m_marginY;
-
+#endif // !wxHAS_BUTTON_BITMAP
 
     wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
-{
-    SetBitmapLabel(bitmap);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/bmpbuttn.h"
 #elif defined(__WXMSW__)
@@ -91,8 +130,6 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
     #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