always return 471 from wxApp::GetComCtl32Version() under CE as its commctrl.dll inclu...

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 2c4ec78da198129e97dc0ede55c48a6a61d62f4d..08ef3da8a756c87c0001aae06d00339f1f5ed54b 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -19,7 +19,7 @@
 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 {
 public:
 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 {
 public:

-    wxBitmapButton() { }
+    wxBitmapButton() { Init(); }

 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,


@@ -30,6 +30,8 @@ public:
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
                    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);
     }
 


@@ -42,15 +44,29 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 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);
     // 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:
     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;
 
     // invalidate m_brushDisabled when system colours change
     virtual wxSize DoGetBestSize() const;
 
     // invalidate m_brushDisabled when system colours change


@@ -63,6 +79,13 @@ protected:
     // the brush we use to draw disabled buttons
     wxBrush m_brushDisabled;
 
     // 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)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)