fix wxPowerEvent, wxRichTextEvent and wxWizardEvent so that they pass the runtime...

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 86ffd452a4c176893f81ef9c4542fc8c90f58e34..fb53b039bf8d711d450faaa098d9b2eba42d674e 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -16,10 +16,10 @@
 #include "wx/bitmap.h"
 #include "wx/brush.h"
 
-class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
 public:
-    wxBitmapButton() { }
+    wxBitmapButton() { Init(); }
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
@@ -30,6 +30,8 @@ public:
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
+        Init();
+
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
@@ -42,6 +44,13 @@ 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 bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
@@ -50,9 +59,17 @@ public:
     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 void OnSetBitmap();
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
 
     // invalidate m_brushDisabled when system colours change
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -64,6 +81,13 @@ protected:
     // 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)