From caf3e97f15e0ccede0e15509c79f3673e822bf9c Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Sat, 21 May 2005 16:19:29 +0000 Subject: [PATCH] May as well add the GTK version runtime checks for the other window styles too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/toplevel.cpp | 31 ++++++++++++++++++------------- src/gtk1/toplevel.cpp | 31 ++++++++++++++++++------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 5ef9d91714..c8705377dc 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -472,21 +472,23 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, { m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); #if GTK_CHECK_VERSION(2,1,0) - if (style & wxFRAME_TOOL_WINDOW) + if (!gtk_check_version(2,1,0)) { - gtk_window_set_type_hint(GTK_WINDOW(m_widget), - GDK_WINDOW_TYPE_HINT_UTILITY); + if (style & wxFRAME_TOOL_WINDOW) + { + gtk_window_set_type_hint(GTK_WINDOW(m_widget), + GDK_WINDOW_TYPE_HINT_UTILITY); - // On some WMs, like KDE, a TOOL_WINDOW will still show - // on the taskbar, but on Gnome a TOOL_WINDOW will not. - // For consistency between WMs and with Windows, we - // should set the NO_TASKBAR flag which will apply - // the set_skip_taskbar_hint if it is available, - // ensuring no taskbar entry will appear. - style |= wxFRAME_NO_TASKBAR; + // On some WMs, like KDE, a TOOL_WINDOW will still show + // on the taskbar, but on Gnome a TOOL_WINDOW will not. + // For consistency between WMs and with Windows, we + // should set the NO_TASKBAR flag which will apply + // the set_skip_taskbar_hint if it is available, + // ensuring no taskbar entry will appear. + style |= wxFRAME_NO_TASKBAR; + } } #endif - } } @@ -500,9 +502,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } #if GTK_CHECK_VERSION(2,2,0) - if (style & wxFRAME_NO_TASKBAR) + if (!gtk_check_version(2,2,0)) { - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE); + if (style & wxFRAME_NO_TASKBAR) + { + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE); + } } #endif diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 5ef9d91714..c8705377dc 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -472,21 +472,23 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, { m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); #if GTK_CHECK_VERSION(2,1,0) - if (style & wxFRAME_TOOL_WINDOW) + if (!gtk_check_version(2,1,0)) { - gtk_window_set_type_hint(GTK_WINDOW(m_widget), - GDK_WINDOW_TYPE_HINT_UTILITY); + if (style & wxFRAME_TOOL_WINDOW) + { + gtk_window_set_type_hint(GTK_WINDOW(m_widget), + GDK_WINDOW_TYPE_HINT_UTILITY); - // On some WMs, like KDE, a TOOL_WINDOW will still show - // on the taskbar, but on Gnome a TOOL_WINDOW will not. - // For consistency between WMs and with Windows, we - // should set the NO_TASKBAR flag which will apply - // the set_skip_taskbar_hint if it is available, - // ensuring no taskbar entry will appear. - style |= wxFRAME_NO_TASKBAR; + // On some WMs, like KDE, a TOOL_WINDOW will still show + // on the taskbar, but on Gnome a TOOL_WINDOW will not. + // For consistency between WMs and with Windows, we + // should set the NO_TASKBAR flag which will apply + // the set_skip_taskbar_hint if it is available, + // ensuring no taskbar entry will appear. + style |= wxFRAME_NO_TASKBAR; + } } #endif - } } @@ -500,9 +502,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } #if GTK_CHECK_VERSION(2,2,0) - if (style & wxFRAME_NO_TASKBAR) + if (!gtk_check_version(2,2,0)) { - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE); + if (style & wxFRAME_NO_TASKBAR) + { + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE); + } } #endif -- 2.45.2