Move "static" keyword out from wxDEPRECATED() macros to placate icc.

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index fb53b039bf8d711d450faaa098d9b2eba42d674e..aff0c0fe143963ddd4f5e9646749f340b5a07fc3 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -44,20 +44,6 @@ 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);
-    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()
 protected:
     // common part of all ctors
     void Init()


@@ -67,25 +53,14 @@ protected:
     }
 
     // reimplement some base class virtuals
     }
 
     // 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;
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);

 
 

-    // true if m_bmpDisabled was set by user, false if we created it ourselves
-    // from m_bmpNormal
+    // true if disabled bitmap was set by user, false if we created it
+    // ourselves from the normal one

     bool m_disabledSetByUser;
 
     bool m_disabledSetByUser;
 

-    // true if m_bmpHover was set by user, false if it was set from m_bmpFocus
+    // true if hover bitmap was set by user, false if it was set from focused
+    // one

     bool m_hoverSetByUser;
 
 
     bool m_hoverSetByUser;