X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a30ccc2d427236ec41db205370104242f83e04e3..f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33:/include/wx/msw/bmpbuttn.h

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 444c147ae1..fb53b039bf 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -16,12 +16,10 @@
 #include "wx/bitmap.h"
 #include "wx/brush.h"
 
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
 public:
-    wxBitmapButton() { }
+    wxBitmapButton() { Init(); }
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
@@ -32,6 +30,8 @@ public:
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
+        Init();
+
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
@@ -44,28 +44,53 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
+    // override some base class methods to automatically synthesize the
+    // disabled bitmap if it wasn't set by the user
+    virtual void SetBitmapLabel(const wxBitmap& bitmap);
+    virtual void SetBitmapFocus(const wxBitmap& focus);
+    virtual void SetBitmapDisabled(const wxBitmap& disabled);
+    virtual void SetBitmapHover(const wxBitmap& hover);
+
     // Implementation
     virtual bool SetBackgroundColour(const wxColour& colour);
-    virtual void SetDefault();
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
 protected:
+    // common part of all ctors
+    void Init()
+    {
+        m_disabledSetByUser =
+        m_hoverSetByUser = false;
+    }
+
+    // reimplement some base class virtuals
     virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
 
     // invalidate m_brushDisabled when system colours change
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+    // change the currently bitmap if we have a hover one
+    void OnMouseEnterOrLeave(wxMouseEvent& event);
+
 
     // the brush we use to draw disabled buttons
     wxBrush m_brushDisabled;
 
+    // true if m_bmpDisabled was set by user, false if we created it ourselves
+    // from m_bmpNormal
+    bool m_disabledSetByUser;
+
+    // true if m_bmpHover was set by user, false if it was set from m_bmpFocus
+    bool m_hoverSetByUser;
+
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
 
-#endif
-    // _WX_BMPBUTTN_H_
+#endif // _WX_BMPBUTTN_H_