diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index 48c13f2b31..d6ae3d84f3 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -32,9 +32,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxBU_AUTODRAW -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ) { @@ -44,9 +42,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -57,9 +53,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxBU_AUTODRAW -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ); diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 81d97f47f7..ba408a4214 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -25,9 +25,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ) { @@ -37,9 +35,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -50,9 +46,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ); diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index 12a43f701d..c2ea188dab 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -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 ); @@ -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 ); diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h index cbecae5fed..c1d6b71f8b 100644 --- a/include/wx/os2/checklst.h +++ b/include/wx/os2/checklst.h @@ -35,9 +35,7 @@ public: ,int nStrings = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr ); diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 103a675808..098c711752 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -28,9 +28,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxChoiceNameStr ) { @@ -41,9 +39,7 @@ public: ,n ,asChoices ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -55,9 +51,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxChoiceNameStr ); diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 2f2e957b1f..4e39936991 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -31,9 +31,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxComboBoxNameStr ) { @@ -45,9 +43,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,n ,asChoices ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -60,9 +56,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxComboBoxNameStr ); diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index fbbb0410c6..1627d70c75 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -26,9 +26,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxControlNameStr ) { @@ -48,9 +46,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxControlNameStr ); diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h index d7dd800512..1b308d2c43 100644 --- a/include/wx/os2/gauge.h +++ b/include/wx/os2/gauge.h @@ -25,9 +25,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxGA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxGaugeNameStr ) { @@ -37,9 +35,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -50,9 +46,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxGA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxGaugeNameStr ); diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index a198afb55b..34c8b4a9e4 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -44,9 +44,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr) { Create( pParent @@ -56,9 +54,7 @@ public: ,n ,asChoices ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -70,9 +66,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr ); diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index 8b1e97a9c0..d6eb7cc229 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -29,9 +29,7 @@ public: ,const wxString asChoices[] = NULL ,int nMajorDim = 0 ,long lStyle = wxRA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rVal = wxDefaultValidator -#endif ,const wxString& rsName = wxRadioBoxNameStr ) { @@ -44,9 +42,7 @@ public: ,asChoices ,nMajorDim ,lStyle -#if wxUSE_VALIDATORS ,rVal -#endif ,rsName ); } @@ -62,9 +58,7 @@ public: ,const wxString asChoices[] = NULL ,int nMajorDim = 0 ,long lStyle = wxRA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rVal = wxDefaultValidator -#endif ,const wxString& rsName = wxRadioBoxNameStr ); diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 753edfc5be..34777de036 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -24,9 +24,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxRadioButtonNameStr ) { @@ -38,9 +36,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -51,9 +47,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxRadioButtonNameStr ); diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h index 9d0c867ae5..af3eba0674 100644 --- a/include/wx/os2/scrolbar.h +++ b/include/wx/os2/scrolbar.h @@ -27,9 +27,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxScrollBarNameStr) { Create(parent, id, pos, size, style, validator, name); @@ -38,9 +36,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxScrollBarNameStr); int GetThumbPosition() const ; diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index 006158d7b8..bc74fe3945 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -27,9 +27,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxSL_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxSliderNameStr ) { @@ -41,9 +39,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -57,9 +53,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxSL_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxSliderNameStr ); diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index 9eb7c15000..b4408f36e9 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -22,9 +22,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxTextCtrlNameStr ) { @@ -38,9 +36,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxTextCtrlNameStr ); diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index e3ae729688..6697e119b7 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -32,9 +32,7 @@ bool wxBitmapButton::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 61b0d68fa4..397ee99eda 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -47,9 +47,7 @@ bool wxButton::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index bfc9f835ad..83480a8ef2 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -62,9 +62,7 @@ bool wxCheckBox::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -76,9 +74,7 @@ bool wxCheckBox::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName )) return FALSE; @@ -192,9 +188,7 @@ bool wxBitmapCheckBox::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index 0a5befdb84..ec5776444d 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -274,9 +274,7 @@ wxCheckListBox::wxCheckListBox ( , int nStrings , const wxString asChoices[] , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rVal -#endif , const wxString& rsName ) : wxListBox() @@ -288,9 +286,7 @@ wxCheckListBox::wxCheckListBox ( ,nStrings ,asChoices ,lStyle | wxLB_OWNERDRAW -#if wxUSE_VALIDATORS ,rVal -#endif ,rsName ); } // end of wxCheckListBox::wxCheckListBox diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index f3f95b2a91..88fff750fb 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -31,9 +31,7 @@ bool wxChoice::Create( , int n , const wxString asChoices[] , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -44,9 +42,7 @@ bool wxChoice::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName )) return FALSE; diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 867815ccdf..90a8241fae 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -95,9 +95,7 @@ bool wxComboBox::Create( , int n , const wxString asChoices[] , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -108,9 +106,7 @@ bool wxComboBox::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName )) return FALSE; diff --git a/src/os2/control.cpp b/src/os2/control.cpp index b7e9f82af7..ed246a1d4e 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -47,9 +47,7 @@ bool wxControl::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp index 05685686b1..0cedb8047f 100644 --- a/src/os2/gauge.cpp +++ b/src/os2/gauge.cpp @@ -140,9 +140,7 @@ bool wxGauge::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index 5714ca119c..69ba786869 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -93,9 +93,7 @@ bool wxListBox::Create( , int n , const wxString asChoices[] , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp index 01871f8e90..b0d640ae17 100644 --- a/src/os2/radiobox.cpp +++ b/src/os2/radiobox.cpp @@ -263,9 +263,7 @@ bool wxRadioBox::Create( , const wxString asChoices[] , int nMajorDim , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rVal -#endif , const wxString& rsName ) { @@ -288,9 +286,7 @@ bool wxRadioBox::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rVal -#endif ,rsName )) return FALSE; diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 76e9a65dde..540bb7deff 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -53,9 +53,7 @@ bool wxRadioButton::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -64,9 +62,7 @@ bool wxRadioButton::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName)) return FALSE; diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp index e77bcbdb26..4b3662cb84 100644 --- a/src/os2/scrolbar.cpp +++ b/src/os2/scrolbar.cpp @@ -33,9 +33,7 @@ END_EVENT_TABLE() bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, -#if wxUSE_VALIDATORS const wxValidator& validator, -#endif const wxString& name) { if (!parent) diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index c8584fc44f..0a6eb8f985 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -204,9 +204,7 @@ bool wxSlider::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index 998c4d9dd3..a30d967d59 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -39,9 +39,7 @@ bool wxStaticBox::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,wxDefaultValidator -#endif ,rsName )) { diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index c567806c24..1e4d42ab48 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -97,9 +97,7 @@ bool wxTextCtrl::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -114,9 +112,7 @@ bool wxTextCtrl::Create( ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName )) return FALSE;