Complete rewrite of DoDrawBitmap() and DoBlit().

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

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index a8e7a2cb743354c7627d1b7c87f1f0c995f59c57..f30a49a2f9de0c5783d0542aaab4ab65bb7baf05 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -13,11 +13,10 @@
 #define _WX_CHECKBOX_H_
 
 #include "wx/control.h"
-                               WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
 
 // 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() { }
@@ -27,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
                      )
     {
@@ -39,9 +36,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -52,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
                );
 
@@ -73,7 +66,7 @@ private:
   DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
+class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
 {
  public:
 
@@ -84,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
                            )
     {
@@ -107,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
                );