Applied patch [ 657969 ] Removes #if wxUSE_VALIDATORS code

for wxOS2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 48c13f2b31660f556d094f234b19d1dabc486135..d6ae3d84f3cee413c9a89ccc57c968236a5f8349 100644 (file)
--- 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
                           ,const wxPoint&     rPos = wxDefaultPosition
                           ,const wxSize&      rSize = wxDefaultSize
                           ,long               lStyle = wxBU_AUTODRAW

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -44,9 +42,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -57,9 +53,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxBU_AUTODRAW
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxBU_AUTODRAW

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 81d97f47f7de5be7ecfd9b8b65c56b28e34f38fa..ba408a4214daf06d771135cd4ab68690d4545d7f 100644 (file)
--- 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
                     ,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 = wxButtonNameStr
                    )
     {
                     ,const wxString&    rsName = wxButtonNameStr
                    )
     {


@@ -37,9 +35,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -50,9 +46,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                 ,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 = wxButtonNameStr
                );
 
                 ,const wxString&    rsName = wxButtonNameStr
                );
 

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index 12a43f701db42b5c8d1fb6d7720240099b23835c..c2ea188daba2c93839297077143af91de4cfe2a4 100644 (file)
--- 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
                       ,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
                      )
     {


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

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,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
                );
 


@@ -83,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
                            )
     {


@@ -106,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
                );
 

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index cbecae5fedf6e8649403bb2b41c02f1cc1ba2082..c1d6b71f8bb3a3ef501582989dbecdb1a37b3045 100644 (file)
--- 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
                    ,int                nStrings = 0
                    ,const wxString     asChoices[] = NULL
                    ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 103a6758082bca6d23740837e2f41beef01a6f44..098c7117522bfec9617ee2cb7b45c92bcbe76592 100644 (file)
--- 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
                     ,int                n = 0
                     ,const wxString     asChoices[] = NULL
                     ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -41,9 +39,7 @@ public:
                ,n
                ,asChoices
                ,lStyle
                ,n
                ,asChoices
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -55,9 +51,7 @@ public:
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 2f2e957b1f95637180cde5f4843f30d19cd20e31..4e3993699104289a81e4677b5c0f287bfe3c3a14 100644 (file)
--- 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
                     ,int                n = 0
                     ,const wxString     asChoices[] = NULL
                     ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -45,9 +43,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                ,n
                ,asChoices
                ,lStyle
                ,n
                ,asChoices
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -60,9 +56,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index fbbb0410c603362d4c6c26630366fb7371f2d20a..1627d70c7590bad0c0ce47aadce63b6cbd712313 100644 (file)
--- 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
              ,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 = wxControlNameStr
             )
     {
              ,const wxString&    rsName = wxControlNameStr
             )
     {


@@ -48,9 +46,7 @@ public:
                 ,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 = wxControlNameStr
                );
 
                 ,const wxString&    rsName = wxControlNameStr
                );
 

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index d7dd800512cfaf1392ef15b504f478a561448f2c..1b308d2c434e3045e23751cc09e32a1281b3bc10 100644 (file)
--- 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
                    ,const wxPoint&     rPos = wxDefaultPosition
                    ,const wxSize&      rSize = wxDefaultSize
                    ,long               lStyle = wxGA_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -37,9 +35,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -50,9 +46,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxGA_HORIZONTAL
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxGA_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index a198afb55be16c557291a09e33fa57297e483a91..34c8b4a9e421ad7b5828605456debcd896231363 100644 (file)
--- 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
               ,int                n = 0
               ,const wxString     asChoices[] = NULL
               ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

               ,const wxString&    rsName = wxListBoxNameStr)
     {
         Create( pParent
               ,const wxString&    rsName = wxListBoxNameStr)
     {
         Create( pParent


@@ -56,9 +54,7 @@ public:
                ,n
                ,asChoices
                ,lStyle
                ,n
                ,asChoices
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -70,9 +66,7 @@ public:
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 8b1e97a9c0beffb3b25a433ee675eaa5a1526031..d6eb7cc229744727917f08e81bdc4f9b6b8e9ba0 100644 (file)
--- 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
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                       ,const wxValidator& rVal = wxDefaultValidator
                       ,const wxValidator& rVal = wxDefaultValidator

-#endif

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


@@ -44,9 +42,7 @@ public:
                ,asChoices
                ,nMajorDim
                ,lStyle
                ,asChoices
                ,nMajorDim
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rVal
                ,rVal

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -62,9 +58,7 @@ public:
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rVal = wxDefaultValidator
                 ,const wxValidator& rVal = wxDefaultValidator

-#endif

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 753edfc5bed923c04515192e470ef7c51878cc34..34777de036d9154c846b42f8f86b178e8aa35468 100644 (file)
--- 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
                          ,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 = wxRadioButtonNameStr
                          )
     {
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {


@@ -38,9 +36,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,9 +47,7 @@ public:
                 ,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 = wxRadioButtonNameStr
                );
 
                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
 

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 9d0c867ae5be29c6577a07787037130eac5dc50f..af3eba0674233b0338e066d7597eb41b7d23ba4a 100644 (file)
--- 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,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,

-#if wxUSE_VALIDATORS

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

-#endif

            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
            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,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,

-#if wxUSE_VALIDATORS

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

-#endif

            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;
            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 006158d7b88730cfd3e50d3d629f77683f29f1ca..bc74fe394593cd4da61131aea9fbf18096f7ab08 100644 (file)
--- 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
                   ,const wxPoint&     rPos = wxDefaultPosition
                   ,const wxSize&      rSize = wxDefaultSize
                   ,long               lStyle = wxSL_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -41,9 +39,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -57,9 +53,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxSL_HORIZONTAL
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxSL_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

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

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 9eb7c150002991efd89f90ccb44616a0175c3003..b4408f36e9622f0189d655f4c23fe354c919445d 100644 (file)
--- 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
                ,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 = wxTextCtrlNameStr
               )
     {
                ,const wxString&    rsName = wxTextCtrlNameStr
               )
     {


@@ -38,9 +36,7 @@ public:
                 ,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 = wxTextCtrlNameStr
                );
 
                 ,const wxString&    rsName = wxTextCtrlNameStr
                );
 

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index e3ae729688c8788d8158034c1e5262d329075eb5..6697e119b7978a6435f990ae2ec5a80d77c53f31 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index 61b0d68fa46505f83d71744963c4474acb19dc78..397ee99edaaa70bedd6871c5e89739d536aa8387 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index bfc9f835ad6b7db5a590be9216a33d0bb7e3fd80..83480a8ef2ff54c281fd68f3c1e27b536de6e982 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -76,9 +74,7 @@ bool wxCheckBox::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;


@@ -192,9 +188,7 @@ bool wxBitmapCheckBox::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 0a5befdb84d657999df3549833f898f1f91f204d..ec5776444d2965b20cd9c670ab8a2c6cf2866492 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -274,9 +274,7 @@ wxCheckListBox::wxCheckListBox (
 , int                               nStrings
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               nStrings
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rVal
 , const wxValidator&                rVal

-#endif

 , const wxString&                   rsName
 )
               : wxListBox()
 , const wxString&                   rsName
 )
               : wxListBox()


@@ -288,9 +286,7 @@ wxCheckListBox::wxCheckListBox (
            ,nStrings
            ,asChoices
            ,lStyle | wxLB_OWNERDRAW
            ,nStrings
            ,asChoices
            ,lStyle | wxLB_OWNERDRAW

-#if wxUSE_VALIDATORS

            ,rVal
            ,rVal

-#endif

            ,rsName
           );
 } // end of wxCheckListBox::wxCheckListBox
            ,rsName
           );
 } // end of wxCheckListBox::wxCheckListBox

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index f3f95b2a91721a56218cc5e2082c3bb720dcc903..88fff750fb200e064abcbf8a1798da481dc4d72c 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -31,9 +31,7 @@ bool wxChoice::Create(
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -44,9 +42,7 @@ bool wxChoice::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 867815ccdfb6d78b0c08f23151d742458d75c1a6..90a8241fae21a63ca96348322652e631966e976a 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -95,9 +95,7 @@ bool wxComboBox::Create(
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -108,9 +106,7 @@ bool wxComboBox::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index b7e9f82af744bcd12d7b907a5781d2d85fd6b50e..ed246a1d4e0b989bffc80d668c229bb73c892555 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 05685686b1a99b7b6200b9552f7fd2def4155011..0cedb8047f69f8715b0646eb61d49c0d9797da82 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 5714ca119c5e68f2cc7e7c56cdbad09453062e03..69ba786869cb12edc69ff528e480d9573b81c8c5 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -93,9 +93,7 @@ bool wxListBox::Create(
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 01871f8e904750d55dfa65ede3e945bd81dd0e39..b0d640ae17bd697d25a93df04a38397484b16344 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -263,9 +263,7 @@ bool wxRadioBox::Create(
 , const wxString                    asChoices[]
 , int                               nMajorDim
 , long                              lStyle
 , const wxString                    asChoices[]
 , int                               nMajorDim
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rVal
 , const wxValidator&                rVal

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -288,9 +286,7 @@ bool wxRadioBox::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rVal
                        ,rVal

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 76e9a65dde5cad72b9273096876859c470d10622..540bb7deffc33561595ace19b5c6edc863e34880 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -64,9 +62,7 @@ bool wxRadioButton::Create(
                         ,rPos
                         ,rSize
                         ,lStyle
                         ,rPos
                         ,rSize
                         ,lStyle

-#if wxUSE_VALIDATORS

                         ,rValidator
                         ,rValidator

-#endif

                         ,rsName))
         return FALSE;
 
                         ,rsName))
         return FALSE;
 

diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp
index e77bcbdb26b19e97df9d23d8f7db9f9b7dad6f79..4b3662cb84e70a1b662d73c09e4a4ae2d502e92d 100644 (file)
--- 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,
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size, long style,

-#if wxUSE_VALIDATORS

            const wxValidator& validator,
            const wxValidator& validator,

-#endif

            const wxString& name)
 {
     if (!parent)
            const wxString& name)
 {
     if (!parent)

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index c8584fc44f81ec7cc7b8a27f7df1808343bb0664..0a6eb8f9854990a7d3d4549c571330f4ae206c1a 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 998c4d9dd3bd49c86e106dd669a72c6adc9f2e92..a30d967d5945fcb6bb5c91d96b6a20075d488403 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -39,9 +39,7 @@ bool wxStaticBox::Create(
                       ,rPos
                       ,rSize
                       ,lStyle
                       ,rPos
                       ,rSize
                       ,lStyle

-#if wxUSE_VALIDATORS

                       ,wxDefaultValidator
                       ,wxDefaultValidator

-#endif

                       ,rsName
                      ))
     {
                       ,rsName
                      ))
     {

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index c567806c24450816f2841ebcf142ab24750649a7..1e4d42ab489439df24a90162795577ce5c47b159 100644 (file)
--- 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
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -114,9 +112,7 @@ bool wxTextCtrl::Create(
                      ,rPos
                      ,rSize
                      ,lStyle
                      ,rPos
                      ,rSize
                      ,lStyle

-#if wxUSE_VALIDATORS

                      ,rValidator
                      ,rValidator

-#endif

                      ,rsName
                     ))
         return FALSE;
                      ,rsName
                     ))
         return FALSE;