fixes for wxFontMapper endless recursion

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index bbf15a8d3bf9f92e21072e7a27288aee18641b83..7be44ed401ee3f6f814cff0eabaef2ad46e2601f 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -29,7 +29,13 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+           const wxValidator* validator = wxDefaultValidator,
+#  else
            const wxValidator& validator = wxDefaultValidator,
+#  endif
+#endif
            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
@@ -38,7 +44,13 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+           const wxValidator* validator = wxDefaultValidator,
+#  else
            const wxValidator& validator = wxDefaultValidator,
+#  endif
+#endif
            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;