diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 52aa11a202..bd85f4f6a2 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -567,7 +567,7 @@ int wxEntry( int argc, char *argv[] ) (gtk_minor_version == 2) && (gtk_micro_version < 4)) { - printf( "wxWindows warning: Disabled GUI threading due to outdated GTK version\n" ); + printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); } else { diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 7eba3ad0a0..13b9e50313 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3040,6 +3040,18 @@ GtkStyle *wxWindow::GetWidgetStyle() void wxWindow::SetWidgetStyle() { + if (m_widget->style->engine_data) + { + static bool s_warningPrinted = FALSE; + if (!s_warningPrinted) + { + printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" ); + s_warningPrinted = TRUE; + } + m_widgetStyle = m_widget->style; + return; + } + GtkStyle *style = GetWidgetStyle(); if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT )) diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 52aa11a202..bd85f4f6a2 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -567,7 +567,7 @@ int wxEntry( int argc, char *argv[] ) (gtk_minor_version == 2) && (gtk_micro_version < 4)) { - printf( "wxWindows warning: Disabled GUI threading due to outdated GTK version\n" ); + printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); } else { diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 7eba3ad0a0..13b9e50313 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -3040,6 +3040,18 @@ GtkStyle *wxWindow::GetWidgetStyle() void wxWindow::SetWidgetStyle() { + if (m_widget->style->engine_data) + { + static bool s_warningPrinted = FALSE; + if (!s_warningPrinted) + { + printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" ); + s_warningPrinted = TRUE; + } + m_widgetStyle = m_widget->style; + return; + } + GtkStyle *style = GetWidgetStyle(); if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))