Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Themes crash fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-09 16:12:35 +00:00
parent a5f4a1bdc8
commit dbefe3d8f5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/window.cpp
View File

@@ -2983,7 +2983,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
GtkStyle *wxWindow::GetWidgetStyle() GtkStyle *wxWindow::GetWidgetStyle()
{ {
if (m_widgetStyle) gtk_style_unref( m_widgetStyle ); if (m_widgetStyle) return m_widgetStyle;
GtkStyle *def = gtk_rc_get_style( m_widget ); GtkStyle *def = gtk_rc_get_style( m_widget );
@@ -2991,7 +2991,6 @@ 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; m_widgetStyle->klass = def->klass;
return m_widgetStyle; return m_widgetStyle;

3
src/gtk1/window.cpp
View File

@@ -2983,7 +2983,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
GtkStyle *wxWindow::GetWidgetStyle() GtkStyle *wxWindow::GetWidgetStyle()
{ {
if (m_widgetStyle) gtk_style_unref( m_widgetStyle ); if (m_widgetStyle) return m_widgetStyle;
GtkStyle *def = gtk_rc_get_style( m_widget ); GtkStyle *def = gtk_rc_get_style( m_widget );
@@ -2991,7 +2991,6 @@ 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; m_widgetStyle->klass = def->klass;
return m_widgetStyle; return m_widgetStyle;