mingw32 compilation fixes

[wxWidgets.git] / src / os2 / listbox.cpp

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index a6909e537fe32b1f5b2f07941ba90ce7a35f306a..7fa3750188190c708dc3cefb8954b675551ee7ff 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -80,7 +80,13 @@ bool wxListBox::Create(wxWindow *parent,
                        const wxSize& size,
                        int n, const wxString choices[],
                        long style,
                        const wxSize& size,
                        int n, const wxString choices[],
                        long style,

+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+                       const wxValidator* validator,
+#  else

                        const wxValidator& validator,
                        const wxValidator& validator,

+#  endif
+#endif

                        const wxString& name)
 {
     m_noItems = 0;
                        const wxString& name)
 {
     m_noItems = 0;


@@ -88,7 +94,9 @@ bool wxListBox::Create(wxWindow *parent,
     m_selected = 0;
 
     SetName(name);
     m_selected = 0;
 
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif

 
     if (parent)
         parent->AddChild(this);
 
     if (parent)
         parent->AddChild(this);


@@ -701,7 +709,7 @@ WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     backgroundBrush->RealizeResource();
     return (WXHBRUSH) backgroundBrush->GetResourceHandle();
 */
     backgroundBrush->RealizeResource();
     return (WXHBRUSH) backgroundBrush->GetResourceHandle();
 */

-    reutrn (WXBRUSH)0;
+    return (WXHBRUSH)0;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------