fixed off by one error in wxXPMDecoder::ReadFile

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 1d9b4392f47f5bae6148c5c685828d5d347e97a6..1b8b532805d32f324652253d81dfd2ebd0d99f51 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -34,11 +34,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
 #if wxUSE_VALIDATORS
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

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

-#  endif

 #endif
            const wxString& name = wxComboBoxNameStr)
   {
 #endif
            const wxString& name = wxComboBoxNameStr)
   {


@@ -52,11 +48,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
 #if wxUSE_VALIDATORS
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

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

-#  endif

 #endif
            const wxString& name = wxComboBoxNameStr);
 
 #endif
            const wxString& name = wxComboBoxNameStr);