Added dde sample; added docs/index.htm

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index eae77c0e492fb16968fd4ace9fd316074f8721b5..12352beb399b8d9298a472a663276a804cc49387 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __BUTTONH__
-#define __BUTTONH__
+#ifndef _WX_BUTTON_H_
+#define _WX_BUTTON_H_

 
 #ifdef __GNUG__
 #pragma interface "button.h"
 
 #ifdef __GNUG__
 #pragma interface "button.h"


@@ -27,30 +27,34 @@ class WXDLLEXPORT wxButton: public wxControl
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton(void) {}
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton(void) {}

-  inline wxButton(wxWindow *parent, const wxWindowID id, const wxString& label,
+  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = 0,
+           const wxSize& size = wxDefaultSize, long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id, const wxString& label,
+  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = 0,
+           const wxSize& size = wxDefaultSize, long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 

-  virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

   virtual void SetDefault(void);
   virtual void SetLabel(const wxString& label);
   virtual wxString GetLabel(void) const ;
   virtual void Command(wxCommandEvent& event);
   virtual void SetDefault(void);
   virtual void SetLabel(const wxString& label);
   virtual wxString GetLabel(void) const ;
   virtual void Command(wxCommandEvent& event);

-  virtual bool MSWCommand(const WXUINT param, const WXWORD id);
-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 };
 
 #endif
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 };
 
 #endif

-    // __BUTTONH__
+    // _WX_BUTTON_H_