Fix for crash when opening empty node

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index f1862b75bf935f012ae02765aee963bda52cb1d2..d3ff05da08fab752c49dda6e1cea85648335d8b3 100644 (file)
--- 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);
-    SetBestFittingSize(wxSize(-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
                       );