X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..a4761b4c08e6272c69bd242b3323ab47dbbc8902:/src/gtk1/control.cpp diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index f0c279a7f0..4e0db419e6 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -83,7 +83,7 @@ void wxControl::PostCreation(const wxSize& size) gtk_widget_ensure_style(m_widget); ApplyWidgetStyle(); - SetInitialBestSize(size); + SetInitialSize(size); } // ---------------------------------------------------------------------------- @@ -120,7 +120,7 @@ void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) const wxString labelGTK = GTKRemoveMnemonics(label); - gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL + gtk_frame_set_label(w, labelGTK.empty() ? (const char *)NULL : wxGTK_CONV(labelGTK)); }