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

May as well add the GTK version runtime checks for the other window styles too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2005-05-21 16:19:29 +00:00
parent 81a3313aa0
commit caf3e97f15
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gtk/toplevel.cpp
View File

@@ -472,21 +472,23 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
{ {
m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
#if GTK_CHECK_VERSION(2,1,0) #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), if (style & wxFRAME_TOOL_WINDOW)
GDK_WINDOW_TYPE_HINT_UTILITY); {
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 some WMs, like KDE, a TOOL_WINDOW will still show
// on the taskbar, but on Gnome a TOOL_WINDOW will not. // on the taskbar, but on Gnome a TOOL_WINDOW will not.
// For consistency between WMs and with Windows, we // For consistency between WMs and with Windows, we
// should set the NO_TASKBAR flag which will apply // should set the NO_TASKBAR flag which will apply
// the set_skip_taskbar_hint if it is available, // the set_skip_taskbar_hint if it is available,
// ensuring no taskbar entry will appear. // ensuring no taskbar entry will appear.
style |= wxFRAME_NO_TASKBAR; style |= wxFRAME_NO_TASKBAR;
}
} }
#endif #endif
} }
} }
@@ -500,9 +502,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
} }
#if GTK_CHECK_VERSION(2,2,0) #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 #endif

31
src/gtk1/toplevel.cpp
View File

@@ -472,21 +472,23 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
{ {
m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
#if GTK_CHECK_VERSION(2,1,0) #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), if (style & wxFRAME_TOOL_WINDOW)
GDK_WINDOW_TYPE_HINT_UTILITY); {
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 some WMs, like KDE, a TOOL_WINDOW will still show
// on the taskbar, but on Gnome a TOOL_WINDOW will not. // on the taskbar, but on Gnome a TOOL_WINDOW will not.
// For consistency between WMs and with Windows, we // For consistency between WMs and with Windows, we
// should set the NO_TASKBAR flag which will apply // should set the NO_TASKBAR flag which will apply
// the set_skip_taskbar_hint if it is available, // the set_skip_taskbar_hint if it is available,
// ensuring no taskbar entry will appear. // ensuring no taskbar entry will appear.
style |= wxFRAME_NO_TASKBAR; style |= wxFRAME_NO_TASKBAR;
}
} }
#endif #endif
} }
} }
@@ -500,9 +502,12 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
} }
#if GTK_CHECK_VERSION(2,2,0) #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 #endif