missing Init() added to wxMenu(wxCallback) ctors

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

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index 677f3699f73ce92d45347b65297a0a7d35b60caf..4b0bff34191e10068aa95a1eb1edd701a4a2186e 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -28,11 +28,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxCheckBoxNameStr)
   {
 #endif
            const wxString& name = wxCheckBoxNameStr)
   {


@@ -43,11 +39,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxCheckBoxNameStr);
 
 #endif
            const wxString& name = wxCheckBoxNameStr);
 


@@ -61,7 +53,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:

-  virtual wxSize DoGetBestSize();
+  virtual wxSize DoGetBestSize() const;

 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox


@@ -77,11 +69,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxCheckBoxNameStr)
   {
 #endif
            const wxString& name = wxCheckBoxNameStr)
   {


@@ -92,11 +80,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxCheckBoxNameStr);
 
 #endif
            const wxString& name = wxCheckBoxNameStr);