Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OW fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-10 19:54:00 +00:00
parent c0f62256f5
commit c34924f7bc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/listbox.cpp
View File

@@ -513,7 +513,7 @@ wxString wxListBox::GetString(int N) const
// +1 for terminating NUL // +1 for terminating NUL
wxString result; wxString result;
ListBox_GetText(GetHwnd(), N, wxStringBuffer(result, len + 1)); ListBox_GetText(GetHwnd(), N, (wxChar*)wxStringBuffer(result, len + 1));
return result; return result;
} }
@@ -616,7 +616,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
return; return;
TEXTMETRIC lpTextMetric; TEXTMETRIC lpTextMetric;
if ( !s.IsEmpty() ) if ( !s.empty() )
{ {
int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L); int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
HDC dc = GetWindowDC(GetHwnd()); HDC dc = GetWindowDC(GetHwnd());

2
src/msw/printwin.cpp
View File

@@ -185,7 +185,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
wxWindow *win = CreateAbortWindow(parent, printout); wxWindow *win = CreateAbortWindow(parent, printout);
wxYield(); wxYield();
#if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__) #if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
#ifdef STRICT #ifdef STRICT
::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc); ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
#else #else