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

wxGTK now ignores widget style when using the pixmap theme.

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

2
src/gtk/app.cpp
View File

@@ -567,7 +567,7 @@ int wxEntry( int argc, char *argv[] )
(gtk_minor_version == 2) && (gtk_minor_version == 2) &&
(gtk_micro_version < 4)) (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 else
{ {

12
src/gtk/window.cpp
View File

@@ -3040,6 +3040,18 @@ GtkStyle *wxWindow::GetWidgetStyle()
void wxWindow::SetWidgetStyle() 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(); GtkStyle *style = GetWidgetStyle();
if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT )) if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))

2
src/gtk1/app.cpp
View File

@@ -567,7 +567,7 @@ int wxEntry( int argc, char *argv[] )
(gtk_minor_version == 2) && (gtk_minor_version == 2) &&
(gtk_micro_version < 4)) (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 else
{ {

12
src/gtk1/window.cpp
View File

@@ -3040,6 +3040,18 @@ GtkStyle *wxWindow::GetWidgetStyle()
void wxWindow::SetWidgetStyle() 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(); GtkStyle *style = GetWidgetStyle();
if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT )) if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))