summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2016-11-04 02:37:11 +0100
committerBenjamin Otte <otte@redhat.com>2016-11-05 03:32:27 +0100
commit33e7a7898faf66562c8591c656da4f1fdfcfa87b (patch)
tree093b460d3490b6d112d5336446e65d1da9be4e7c /gdk/win32
parent1dbdbecd39356a6ca4d0bb06a222d3229e055b3b (diff)
downloadgtk+-33e7a7898faf66562c8591c656da4f1fdfcfa87b.tar.gz
API: gdk: Remove gdk_window_set_override_redirect()
When you want an override-redirect window, you create it that way. Changing that behavior is not supported anywhere (but on X of course).
Diffstat (limited to 'gdk/win32')
-rw-r--r--gdk/win32/gdkwindow-win32.c32
-rw-r--r--gdk/win32/gdkwindow-win32.h1
2 files changed, 4 insertions, 29 deletions
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 9069b4c306..bfd9c21f52 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -702,7 +702,6 @@ _gdk_win32_display_create_window_impl (GdkDisplay *display,
GdkWin32Display *display_win32;
const gchar *title;
wchar_t *wtitle;
- gboolean override_redirect;
gint window_width, window_height;
gint offset_x = 0, offset_y = 0;
gint x, y, real_x = 0, real_y = 0;
@@ -732,16 +731,10 @@ _gdk_win32_display_create_window_impl (GdkDisplay *display,
g_assert (attributes->y == window->y);
remaining_mask &= ~GDK_WA_Y;
}
- override_redirect = FALSE;
- if ((attributes_mask & GDK_WA_NOREDIR) != 0)
- {
- override_redirect = !!attributes->override_redirect;
- remaining_mask &= ~GDK_WA_NOREDIR;
- }
- if ((remaining_mask & ~(GDK_WA_TITLE|GDK_WA_TYPE_HINT)) != 0)
+ if ((remaining_mask & ~(GDK_WA_NOREDIR|GDK_WA_TITLE|GDK_WA_TYPE_HINT)) != 0)
g_warning ("_gdk_window_impl_new: uexpected attribute 0x%X",
- remaining_mask & ~(GDK_WA_TITLE|GDK_WA_TYPE_HINT));
+ remaining_mask & ~(GDK_WA_NOREDIR|GDK_WA_TITLE|GDK_WA_TYPE_HINT));
hparent = GDK_WINDOW_HWND (real_parent);
@@ -749,7 +742,6 @@ _gdk_win32_display_create_window_impl (GdkDisplay *display,
impl->wrapper = GDK_WINDOW (window);
window->impl = GDK_WINDOW_IMPL (impl);
- impl->override_redirect = override_redirect;
impl->layered = FALSE;
impl->layered_opacity = 1.0;
@@ -1261,8 +1253,7 @@ show_window_internal (GdkWindow *window,
window_impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (!already_mapped &&
GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL &&
- (window_impl->hint_flags & (GDK_HINT_POS | GDK_HINT_USER_POS)) == 0 &&
- !window_impl->override_redirect)
+ (window_impl->hint_flags & (GDK_HINT_POS | GDK_HINT_USER_POS)) == 0)
{
gboolean center = FALSE;
RECT window_rect, center_on_rect;
@@ -1322,8 +1313,7 @@ show_window_internal (GdkWindow *window,
}
if (!already_mapped &&
- GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL &&
- !window_impl->override_redirect)
+ GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
{
/* Ensure new windows are fully onscreen */
RECT window_rect;
@@ -2467,19 +2457,6 @@ do_shape_combine_region (GdkWindow *window,
}
static void
-gdk_win32_window_set_override_redirect (GdkWindow *window,
- gboolean override_redirect)
-{
- GdkWindowImplWin32 *window_impl;
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- window_impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
-
- window_impl->override_redirect = !!override_redirect;
-}
-
-static void
gdk_win32_window_set_accept_focus (GdkWindow *window,
gboolean accept_focus)
{
@@ -6128,7 +6105,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
//impl_class->set_startup_id = gdk_x11_window_set_startup_id;
impl_class->set_transient_for = gdk_win32_window_set_transient_for;
impl_class->get_frame_extents = gdk_win32_window_get_frame_extents;
- impl_class->set_override_redirect = gdk_win32_window_set_override_redirect;
impl_class->set_accept_focus = gdk_win32_window_set_accept_focus;
impl_class->set_focus_on_map = gdk_win32_window_set_focus_on_map;
impl_class->set_icon_list = gdk_win32_window_set_icon_list;
diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h
index de18c45141..6e5f3d8405 100644
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdkwindow-win32.h
@@ -273,7 +273,6 @@ struct _GdkWindowImplWin32
guint zero_margins : 1;
guint no_bg : 1;
guint inhibit_configure : 1;
- guint override_redirect : 1;
/* Set to TRUE if window is using true layered mode adjustments
* via UpdateLayeredWindow().