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

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 587e46e00432173f0600ec226e30c78f560461b3..26979a8939615b000e94984831919c66c3c063dc 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -4,13 +4,12 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
+#ifndef _WX_MSW_BUTTON_H_
+#define _WX_MSW_BUTTON_H_
 
 // ----------------------------------------------------------------------------
 // Pushbutton
@@ -19,7 +18,7 @@
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
-    wxButton() { m_imageData = NULL; }
+    wxButton() { Init(); }
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,
@@ -29,7 +28,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
-        m_imageData = NULL;
+        Init();
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -47,22 +46,13 @@ public:
 
     virtual wxWindow *SetDefault();
 
-    // overridden base class methods
-    virtual void SetLabel(const wxString& label);
-    virtual bool SetBackgroundColour(const wxColour &colour);
-    virtual bool SetForegroundColour(const wxColour &colour);
-
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
     // send a notification event, return true if processed
     bool SendClickEvent();
@@ -74,35 +64,22 @@ protected:
     // set or unset BS_DEFPUSHBUTTON style
     static void SetDefaultStyle(wxButton *btn, bool on);
 
-    // usually overridden base class virtuals
-    virtual wxSize DoGetBestSize() const;
-
     virtual bool DoGetAuthNeeded() const;
     virtual void DoSetAuthNeeded(bool show);
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual wxSize DoGetBitmapMargins() const;
-    virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-
-    // Increases the passed in size to account for the button image.
-    //
-    // Should only be called if we do have a button, i.e. if m_imageData is
-    // non-NULL.
-    void AdjustForBitmapSize(wxSize& size) const;
-
-    class wxButtonImageData *m_imageData;
 
     // true if the UAC symbol is shown
     bool m_authNeeded;
 
 private:
-    // Switches button into owner-drawn mode: this is used if we need to draw
-    // something not supported by the native control, such as using non default
-    // colours or a bitmap on pre-XP systems.
-    void MakeOwnerDrawn();
+    void Init()
+    {
+        m_authNeeded = false;
+    }
+
+    void OnCharHook(wxKeyEvent& event);
 
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
 };
 
-#endif // _WX_BUTTON_H_
+#endif // _WX_MSW_BUTTON_H_