Themes again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 5b16248fcd89cf06327b3dfe344d0476729cf1bd..4fd565e8dcffa2848bd020ab1bb37baf0b7ce7ed 100644 (file)
--- 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();
   
   
     PostCreation();
   

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize best_size( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize best_size( DoGetBestSize() );

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 051e51b500bd5a4442741a9d09d55bf072740d3c..8bc24ddf9e682acf443fd65856bb6a689257791f 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index dda0c63e8ffca99b76af48a0944e6b45e580f5d5..d794e2a915de0979ee77102f060cbb8a4320319f 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 8369ebbf0fbfb8a8573e4efd41ea550ea263ece5..40e9370a104bf907598e10f4247c08695b9d903c 100644 (file)
--- 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();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     ConnectWidget( GTK_COMBO(m_widget)->button );
 
     if (!value.IsNull()) SetValue( value );
     ConnectWidget( GTK_COMBO(m_widget)->button );
 
     if (!value.IsNull()) SetValue( value );

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 2afc3aec550c2380e0e38eabb292e9a85a1ea86c..3a3c84758825148a674bd030544e991bf6cbc9bc 100644 (file)
--- 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();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetLabel( title );
 
     SetFont( parent->GetFont() );
     SetLabel( title );
 
     SetFont( parent->GetFont() );

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 830c410d4f53a910a3b7e31065d5ec9359ccb780..fbb0a53ced57187671024cbc362c3fec12a817e8 100644 (file)
--- 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();
 
   
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 9e51422831dd85d04c741b0666d345ea896a85e9..bcf26bcadb1b7681379d10cfb1de4ed26d52337a 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index eb53692cfc08b576c5dc5e277d2cde3be63d63df..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644 (file)
--- 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);
   
 
     SetLabel(label);
   

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
     SetFont( parent->GetFont() );

-    

 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 54d7366a4f4f360500edd220f2de037225edcd96..ff7c054a02055ea3bfc69b425a2f9ecdf9fbe549 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     wxControl::SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );
     wxControl::SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 332fd7407e3f30509b2e609aa734912ea22c0662..83092d0e09eea563e02975feee0ed15dc1e93b37 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     Show( TRUE );
 
     return TRUE;
     Show( TRUE );
 
     return TRUE;


@@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle()
         def = gtk_widget_get_default_style();
 
     m_widgetStyle = gtk_style_copy( def );
         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;
 }
 
     return m_widgetStyle;
 }

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 5b16248fcd89cf06327b3dfe344d0476729cf1bd..4fd565e8dcffa2848bd020ab1bb37baf0b7ce7ed 100644 (file)
--- 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();
   
   
     PostCreation();
   

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize best_size( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize best_size( DoGetBestSize() );

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 051e51b500bd5a4442741a9d09d55bf072740d3c..8bc24ddf9e682acf443fd65856bb6a689257791f 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -115,8 +115,6 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index dda0c63e8ffca99b76af48a0944e6b45e580f5d5..d794e2a915de0979ee77102f060cbb8a4320319f 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -110,8 +110,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 8369ebbf0fbfb8a8573e4efd41ea550ea263ece5..40e9370a104bf907598e10f4247c08695b9d903c 100644 (file)
--- 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();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     ConnectWidget( GTK_COMBO(m_widget)->button );
 
     if (!value.IsNull()) SetValue( value );
     ConnectWidget( GTK_COMBO(m_widget)->button );
 
     if (!value.IsNull()) SetValue( value );

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 2afc3aec550c2380e0e38eabb292e9a85a1ea86c..3a3c84758825148a674bd030544e991bf6cbc9bc 100644 (file)
--- 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();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetLabel( title );
 
     SetFont( parent->GetFont() );
     SetLabel( title );
 
     SetFont( parent->GetFont() );

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 830c410d4f53a910a3b7e31065d5ec9359ccb780..fbb0a53ced57187671024cbc362c3fec12a817e8 100644 (file)
--- 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();
 
   
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
 
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 9e51422831dd85d04c741b0666d345ea896a85e9..bcf26bcadb1b7681379d10cfb1de4ed26d52337a 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -97,8 +97,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );
     SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index eb53692cfc08b576c5dc5e277d2cde3be63d63df..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644 (file)
--- 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);
   
 
     SetLabel(label);
   

-    ApplyWidgetStyle();
-

     SetFont( parent->GetFont() );
     SetFont( parent->GetFont() );

-    

 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 54d7366a4f4f360500edd220f2de037225edcd96..ff7c054a02055ea3bfc69b425a2f9ecdf9fbe549 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -82,8 +82,6 @@ bool wxStaticText::Create(wxWindow *parent,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     wxControl::SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );
     wxControl::SetFont( parent->GetFont() );
     
     wxSize size_best( DoGetBestSize() );

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 332fd7407e3f30509b2e609aa734912ea22c0662..83092d0e09eea563e02975feee0ed15dc1e93b37 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2022,8 +2022,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-

     Show( TRUE );
 
     return TRUE;
     Show( TRUE );
 
     return TRUE;


@@ -2949,6 +2947,8 @@ GtkStyle *wxWindow::GetWidgetStyle()
         def = gtk_widget_get_default_style();
 
     m_widgetStyle = gtk_style_copy( def );
         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;
 }
 
     return m_widgetStyle;
 }