X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/170acdc90e9f92f8b8120fa6c04acdbf45c89582..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/combobox.cpp diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 75a0337578..d3ff05da08 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -167,7 +167,7 @@ bool wxComboBox::Create( int nEditHeight; wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont ); nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight); - SetInitialSize(-1,nEditHeight+4)); // +2x2 for the border + SetInitialSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border if (!rsValue.empty()) { @@ -193,7 +193,7 @@ void wxComboBox::SetValue( if ( HasFlag(wxCB_READONLY) ) SetStringSelection(rsValue); else - ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str()); + ::WinSetWindowText(GetHwnd(), rsValue.c_str()); } // end of wxComboBox::SetValue // @@ -299,7 +299,7 @@ void wxComboBox::Replace( long lFrom, // Now replace with 'value', by pasting. // wxSetClipboardData( wxDF_TEXT - ,(wxObject *)rsValue.c_str() + ,rsValue.c_str() ,0 ,0 );