OW fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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());
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user