X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb49f3b32e78c4f951c7331447851c3aa0302dde..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/os2/combobox.h?ds=inline

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 1678e513f1..4e39936991 100644
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -16,9 +16,6 @@
 
 #if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxChoice
 {
@@ -34,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
                    )
     {
@@ -48,9 +43,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice
                ,n
                ,asChoices
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -63,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
                );