From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Wed, 10 Nov 2004 19:54:00 +0000 (+0000)
Subject: OW fixes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c34924f7bc6a373865e1f24f529ae9500230c6ed?ds=inline

OW fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 84e7896bdf..7b7fcc8d18 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -513,7 +513,7 @@ wxString wxListBox::GetString(int N) const
 
     // +1 for terminating NUL
     wxString result;
-    ListBox_GetText(GetHwnd(), N, wxStringBuffer(result, len + 1));
+    ListBox_GetText(GetHwnd(), N, (wxChar*)wxStringBuffer(result, len + 1));
 
     return result;
 }
@@ -616,7 +616,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         return;
     TEXTMETRIC lpTextMetric;
 
-    if ( !s.IsEmpty() )
+    if ( !s.empty() )
     {
         int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
         HDC dc = GetWindowDC(GetHwnd());
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 99c8ac21e3..727d956f2c 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -185,7 +185,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
-#if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
 #ifdef STRICT
     ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
 #else