X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/os2/checkbox.h?ds=sidebyside

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index 12a43f701d..e03084b29b 100644
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/os2/checkbox.h
 // Purpose:     wxCheckBox class
 // Author:      David Webster
 // Modified by:
@@ -15,8 +15,8 @@
 #include "wx/control.h"
 
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
  public:
     inline wxCheckBox() { }
@@ -26,9 +26,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                       ,const wxPoint&     rPos = wxDefaultPosition
                       ,const wxSize&      rSize = wxDefaultSize
                       ,long lStyle = 0
-#if wxUSE_VALIDATORS
                       ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                       ,const wxString&    rsName = wxCheckBoxNameStr
                      )
     {
@@ -38,9 +36,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -51,9 +47,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxCheckBoxNameStr
                );
 
@@ -72,7 +66,7 @@ private:
   DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
+class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
 {
  public:
 
@@ -83,9 +77,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                             ,const wxPoint&     rPos = wxDefaultPosition
                             ,const wxSize&      rSize = wxDefaultSize
                             ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                             ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                             ,const wxString&    rsName = wxCheckBoxNameStr
                            )
     {
@@ -106,9 +98,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxCheckBoxNameStr
                );
 
@@ -120,7 +110,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 private:
 
     virtual void SetLabel(const wxString& rsString)
-    { wxCheckBox::SetLabel(rsString); };
+    { wxCheckBox::SetLabel(rsString); }
     DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
 };
 #endif