_MSC_VER => __VISUALC__ change

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 965da6d7d5b6fa537962f380de61da86a54ed57d..f693730f5ca3afcc034e24a3063f7a5a4ff99f60 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.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 __CHECKBOXH__
-#define __CHECKBOXH__
+#ifndef _WX_CHECKBOX_H_
+#define _WX_CHECKBOX_H_

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


@@ -28,27 +28,31 @@ class WXDLLEXPORT wxCheckBox: public wxControl
 
  public:
   inline wxCheckBox(void) { }
 
  public:
   inline wxCheckBox(void) { }

-  inline wxCheckBox(wxWindow *parent, const wxWindowID id, const wxString& label,
+  inline wxCheckBox(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 = wxCheckBoxNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr)
   {
       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 = wxCheckBoxNameStr);
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr);

-  virtual void SetValue(const bool);
+  virtual void SetValue(bool);

   virtual bool GetValue(void) const ;
   virtual bool GetValue(void) const ;

-  virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
-  virtual bool MSWCommand(const WXUINT param, const WXWORD id);
+  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 bool MSWCommand(WXUINT param, WXWORD id);

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

-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

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


@@ -61,24 +65,28 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
   int checkHeight ;
 
   inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; }
   int checkHeight ;
 
   inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; }

-  inline wxBitmapCheckBox(wxWindow *parent, const wxWindowID id, const wxBitmap *label,
+  inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *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 = wxCheckBoxNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id, const wxBitmap *bitmap,
+  bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,

            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 = wxCheckBoxNameStr);
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr);

-  virtual void SetValue(const bool);
+  virtual void SetValue(bool);

   virtual bool GetValue(void) const ;
   virtual bool GetValue(void) const ;

-  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 SetLabel(const wxBitmap *bitmap);
 };
 #endif
   virtual void SetLabel(const wxBitmap *bitmap);
 };
 #endif

-    // __CHECKBOXH__
+    // _WX_CHECKBOX_H_