added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index a8e7a2cb743354c7627d1b7c87f1f0c995f59c57..c2ea188daba2c93839297077143af91de4cfe2a4 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -13,7 +13,6 @@
 #define _WX_CHECKBOX_H_
 
 #include "wx/control.h"
 #define _WX_CHECKBOX_H_
 
 #include "wx/control.h"

-                               WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;

 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;


@@ -27,9 +26,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                       ,const wxPoint&     rPos = wxDefaultPosition
                       ,const wxSize&      rSize = wxDefaultSize
                       ,long lStyle = 0
                       ,const wxPoint&     rPos = wxDefaultPosition
                       ,const wxSize&      rSize = wxDefaultSize
                       ,long lStyle = 0

-#if wxUSE_VALIDATORS

                       ,const wxValidator& rValidator = wxDefaultValidator
                       ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                       ,const wxString&    rsName = wxCheckBoxNameStr
                      )
     {
                       ,const wxString&    rsName = wxCheckBoxNameStr
                      )
     {


@@ -39,9 +36,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -52,9 +47,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxCheckBoxNameStr
                );
 
                 ,const wxString&    rsName = wxCheckBoxNameStr
                );
 


@@ -84,9 +77,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                             ,const wxPoint&     rPos = wxDefaultPosition
                             ,const wxSize&      rSize = wxDefaultSize
                             ,long               lStyle = 0
                             ,const wxPoint&     rPos = wxDefaultPosition
                             ,const wxSize&      rSize = wxDefaultSize
                             ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                             ,const wxValidator& rValidator = wxDefaultValidator
                             ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                             ,const wxString&    rsName = wxCheckBoxNameStr
                            )
     {
                             ,const wxString&    rsName = wxCheckBoxNameStr
                            )
     {


@@ -107,9 +98,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxCheckBoxNameStr
                );
 
                 ,const wxString&    rsName = wxCheckBoxNameStr
                );