X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..14a6b6e5f0200192944ed3d35ef4a3ce4549ac70:/src/gtk1/control.cpp diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index ed8b2147e8..41f5cc4ea1 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -33,7 +33,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { m_needParent = TRUE; - m_createComplete = false; } bool wxControl::Create( wxWindow *parent, @@ -44,7 +43,6 @@ bool wxControl::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_createComplete = false; bool ret = wxWindow::Create(parent, id, pos, size, style, name); #if wxUSE_VALIDATORS @@ -70,14 +68,6 @@ void wxControl::SetLabel( const wxString &label ) } } -void wxControl::PostSetLabel() -{ - // make sure the widget has been created, and that PostCreate has already - // been called - if (m_widget && m_createComplete && GetAdjustMinSizeFlag()) - SetBestSize(wxDefaultSize); -} - wxString wxControl::GetLabel() const { return m_label; @@ -113,7 +103,6 @@ void wxControl::PostCreation(const wxSize& size) InheritAttributes(); ApplyWidgetStyle(); SetInitialBestSize(size); - m_createComplete = true; } @@ -278,21 +267,5 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm return attr; } -void wxControl::ApplyWidgetStyle(bool forceStyle) -{ - GtkRcStyle *style = CreateWidgetStyle(forceStyle); - if ( style ) - { - DoApplyWidgetStyle(style); - gtk_rc_style_unref(style); - } -} - -void wxControl::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); -} - - #endif // wxUSE_CONTROLS