fixes for wxFontMapper endless recursion

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index b36c2eeae39a8065dfa2223235a74a74d771f572..1d9b4392f47f5bae6148c5c685828d5d347e97a6 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -33,7 +33,13 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            const wxSize& size = wxDefaultSize,
            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,
+#  endif
+#endif
            const wxString& name = wxComboBoxNameStr)
   {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
@@ -45,7 +51,13 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            const wxSize& size = wxDefaultSize,
            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,
+#  endif
+#endif
            const wxString& name = wxComboBoxNameStr);
 
     // List functions: see wxChoice