Blind fix for bug #1936227 (unable to set initial value > 100).

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 8630e49ab10a2da0210809962d467f3ec47e9208..5d3cab5ce7d0103a6f51cdfb113125ee3bda9f20 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -1,87 +1,94 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.h
+// Name:        wx/msw/bmpbuttn.h

 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 

-#ifdef __GNUG__
-#pragma interface "bmpbuttn.h"
-#endif
-

 #include "wx/button.h"
 #include "wx/button.h"

+#include "wx/bitmap.h"
+#include "wx/brush.h"

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLEXPORT wxBitmapButton: public wxButton
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-

 public:
 public:

-    wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
-    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr)
+    wxBitmapButton() { Init(); }
+
+    wxBitmapButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxBU_AUTODRAW,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxButtonNameStr)

     {
     {

+        Init();
+

         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 

-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& bitmap,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxBU_AUTODRAW,
+                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 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 );

 
 

-    virtual void SetLabel(const wxBitmap& bitmap)
+protected:
+    // common part of all ctors
+    void Init()

     {
     {

-        SetBitmapLabel(bitmap);
+        m_disabledSetByUser =
+        m_hoverSetByUser = false;

     }
 
     }
 

-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
+    // reimplement some base class virtuals
+    virtual wxSize DoGetBestSize() const;

 
 

-#if WXWIN_COMPATIBILITY
-    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_buttonBitmap; }
-#endif
+    // invalidate m_brushDisabled when system colours change
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
 

-    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; }
-    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; }
-    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; }
-    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; }
+    // change the currently bitmap if we have a hover one
+    void OnMouseEnterOrLeave(wxMouseEvent& event);

 
 

-    void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
-    void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
-    void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };

 
 

-    void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
-    int GetMarginX() const { return m_marginX; }
-    int GetMarginY() const { return m_marginY; }
+    // the brush we use to draw disabled buttons
+    wxBrush m_brushDisabled;

 
 

-    // Implementation
-    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 );
+    // true if m_bmpDisabled was set by user, false if we created it ourselves
+    // from m_bmpNormal
+    bool m_disabledSetByUser;

 
 

-protected:
-    wxBitmap m_buttonBitmap;
-    wxBitmap m_buttonBitmapSelected;
-    wxBitmap m_buttonBitmapFocus;
-    wxBitmap m_buttonBitmapDisabled;
-    int      m_marginX;
-    int      m_marginY;
+    // 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_