Added wxStrnicmp and to wchar.h, not yet for Unicode mode.

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 34e0824d6daf97e40151c26bf82ac8fbd448365f..794d9f933733034dd9703c0d11995a81d5b23460 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_


@@ -17,39 +17,56 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

-#include "wx/gdicmn.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;

 
 

+// ----------------------------------------------------------------------------

 // Pushbutton
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxButton : public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)
- public:
-  inline wxButton(void) {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual void SetDefault(void);
-  virtual void SetLabel(const wxString& label);
-  virtual wxString GetLabel(void) const ;
-  virtual void Command(wxCommandEvent& event);
-  virtual bool MSWCommand(WXUINT param, WXWORD id);
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+DECLARE_DYNAMIC_CLASS(wxButton)
+
+public:
+    wxButton() { }
+    wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxButtonNameStr);
+
+    virtual ~wxButton();
+
+    virtual void SetDefault();
+
+    static wxSize GetDefaultSize();
+
+    // implementation from now on
+    virtual void Command(wxCommandEvent& event);
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC,
+                                WXHWND pWnd,
+                                WXUINT nCtlColor,
+                                WXUINT message,
+                                WXWPARAM wParam,
+                                WXLPARAM lParam);
+
+protected:
+    // send a notification event, return TRUE if processed
+    bool SendClickEvent();
+
+    virtual wxSize DoGetBestSize();

 };
 
 #endif
 };
 
 #endif