From 850ff4855026066770d80c376ee6fc864169509c Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 6 Jan 2000 17:32:49 +0000 Subject: [PATCH] Themes again. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/button.cpp | 2 -- src/gtk/checkbox.cpp | 2 -- src/gtk/choice.cpp | 2 -- src/gtk/combobox.cpp | 2 -- src/gtk/radiobox.cpp | 2 -- src/gtk/radiobut.cpp | 2 -- src/gtk/spinctrl.cpp | 2 -- src/gtk/statbox.cpp | 3 --- src/gtk/stattext.cpp | 2 -- src/gtk/window.cpp | 4 ++-- src/gtk1/button.cpp | 2 -- src/gtk1/checkbox.cpp | 2 -- src/gtk1/choice.cpp | 2 -- src/gtk1/combobox.cpp | 2 -- src/gtk1/radiobox.cpp | 2 -- src/gtk1/radiobut.cpp | 2 -- src/gtk1/spinctrl.cpp | 2 -- src/gtk1/statbox.cpp | 3 --- src/gtk1/stattext.cpp | 2 -- src/gtk1/window.cpp | 4 ++-- 20 files changed, 4 insertions(+), 42 deletions(-) diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 5b16248fcd..4fd565e8dc 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -118,8 +118,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize best_size( DoGetBestSize() ); diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 051e51b500..8bc24ddf9e 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index dda0c63e8f..d794e2a915 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 8369ebbf0f..40e9370a10 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -138,8 +138,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, PostCreation(); - ApplyWidgetStyle(); - ConnectWidget( GTK_COMBO(m_widget)->button ); if (!value.IsNull()) SetValue( value ); diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 2afc3aec55..3a3c847588 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -184,8 +184,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, PostCreation(); - ApplyWidgetStyle(); - SetLabel( title ); SetFont( parent->GetFont() ); diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 830c410d4f..fbb0a53ced 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -116,8 +116,6 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 9e51422831..bcf26bcadb 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index eb53692cfc..7afc40103d 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -61,10 +61,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label SetLabel(label); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); - SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 54d7366a4f..ff7c054a02 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent, PostCreation(); - ApplyWidgetStyle(); - wxControl::SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 332fd7407e..83092d0e09 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - Show( TRUE ); return TRUE; @@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle() def = gtk_widget_get_default_style(); m_widgetStyle = gtk_style_copy( def ); + m_widgetStyle->engine_data = def->engine_data; + m_widgetStyle->klass = def->klass; return m_widgetStyle; } diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 5b16248fcd..4fd565e8dc 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -118,8 +118,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize best_size( DoGetBestSize() ); diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index 051e51b500..8bc24ddf9e 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index dda0c63e8f..d794e2a915 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 8369ebbf0f..40e9370a10 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -138,8 +138,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, PostCreation(); - ApplyWidgetStyle(); - ConnectWidget( GTK_COMBO(m_widget)->button ); if (!value.IsNull()) SetValue( value ); diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 2afc3aec55..3a3c847588 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -184,8 +184,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, PostCreation(); - ApplyWidgetStyle(); - SetLabel( title ); SetFont( parent->GetFont() ); diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index 830c410d4f..fbb0a53ced 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -116,8 +116,6 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index 9e51422831..bcf26bcadb 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index eb53692cfc..7afc40103d 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -61,10 +61,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label SetLabel(label); - ApplyWidgetStyle(); - SetFont( parent->GetFont() ); - SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index 54d7366a4f..ff7c054a02 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent, PostCreation(); - ApplyWidgetStyle(); - wxControl::SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 332fd7407e..83092d0e09 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, PostCreation(); - ApplyWidgetStyle(); - Show( TRUE ); return TRUE; @@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle() def = gtk_widget_get_default_style(); m_widgetStyle = gtk_style_copy( def ); + m_widgetStyle->engine_data = def->engine_data; + m_widgetStyle->klass = def->klass; return m_widgetStyle; } -- 2.47.2