Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index a0d1dfd2fef55a414702127130d4a093df8bf8b5..e435673c2b8e849c61bd4ac31aab9ffdb4db20c4 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,7 +18,7 @@
 class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
 public:
 class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
 public:

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

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


@@ -30,8 +29,6 @@ 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);
     }
 


@@ -44,47 +41,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    // 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:
 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;
-
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-
-
-    // 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 disabled bitmap was set by user, false if we created it
-    // ourselves from the normal one
-    bool m_disabledSetByUser;
-
-    // true if hover bitmap was set by user, false if it was set from focused
-    // one
-    bool m_hoverSetByUser;
-
-

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };