Themes again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,8 +118,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize best_size( DoGetBestSize() );
|
wxSize best_size( DoGetBestSize() );
|
||||||
|
@@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -138,8 +138,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
ConnectWidget( GTK_COMBO(m_widget)->button );
|
ConnectWidget( GTK_COMBO(m_widget)->button );
|
||||||
|
|
||||||
if (!value.IsNull()) SetValue( value );
|
if (!value.IsNull()) SetValue( value );
|
||||||
|
@@ -184,8 +184,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetLabel( title );
|
SetLabel( title );
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
@@ -116,8 +116,6 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -61,10 +61,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
|
|||||||
|
|
||||||
SetLabel(label);
|
SetLabel(label);
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
|
|
||||||
SetBackgroundColour( parent->GetBackgroundColour() );
|
SetBackgroundColour( parent->GetBackgroundColour() );
|
||||||
SetForegroundColour( parent->GetForegroundColour() );
|
SetForegroundColour( parent->GetForegroundColour() );
|
||||||
|
@@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
wxControl::SetFont( parent->GetFont() );
|
wxControl::SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
Show( TRUE );
|
Show( TRUE );
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle()
|
|||||||
def = gtk_widget_get_default_style();
|
def = gtk_widget_get_default_style();
|
||||||
|
|
||||||
m_widgetStyle = gtk_style_copy( def );
|
m_widgetStyle = gtk_style_copy( def );
|
||||||
|
m_widgetStyle->engine_data = def->engine_data;
|
||||||
|
m_widgetStyle->klass = def->klass;
|
||||||
|
|
||||||
return m_widgetStyle;
|
return m_widgetStyle;
|
||||||
}
|
}
|
||||||
|
@@ -118,8 +118,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize best_size( DoGetBestSize() );
|
wxSize best_size( DoGetBestSize() );
|
||||||
|
@@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -138,8 +138,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
ConnectWidget( GTK_COMBO(m_widget)->button );
|
ConnectWidget( GTK_COMBO(m_widget)->button );
|
||||||
|
|
||||||
if (!value.IsNull()) SetValue( value );
|
if (!value.IsNull()) SetValue( value );
|
||||||
|
@@ -184,8 +184,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetLabel( title );
|
SetLabel( title );
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
@@ -116,8 +116,6 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -61,10 +61,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
|
|||||||
|
|
||||||
SetLabel(label);
|
SetLabel(label);
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
SetFont( parent->GetFont() );
|
SetFont( parent->GetFont() );
|
||||||
|
|
||||||
|
|
||||||
SetBackgroundColour( parent->GetBackgroundColour() );
|
SetBackgroundColour( parent->GetBackgroundColour() );
|
||||||
SetForegroundColour( parent->GetForegroundColour() );
|
SetForegroundColour( parent->GetForegroundColour() );
|
||||||
|
@@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
wxControl::SetFont( parent->GetFont() );
|
wxControl::SetFont( parent->GetFont() );
|
||||||
|
|
||||||
wxSize size_best( DoGetBestSize() );
|
wxSize size_best( DoGetBestSize() );
|
||||||
|
@@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
PostCreation();
|
PostCreation();
|
||||||
|
|
||||||
ApplyWidgetStyle();
|
|
||||||
|
|
||||||
Show( TRUE );
|
Show( TRUE );
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle()
|
|||||||
def = gtk_widget_get_default_style();
|
def = gtk_widget_get_default_style();
|
||||||
|
|
||||||
m_widgetStyle = gtk_style_copy( def );
|
m_widgetStyle = gtk_style_copy( def );
|
||||||
|
m_widgetStyle->engine_data = def->engine_data;
|
||||||
|
m_widgetStyle->klass = def->klass;
|
||||||
|
|
||||||
return m_widgetStyle;
|
return m_widgetStyle;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user