Remove the long deprecated GDK_WINDOW_DIALOG type.
This has been deprecated forever, and was just left in for compatibility reasons.
This commit is contained in:
@ -1445,7 +1445,6 @@ gdk_synthesize_window_state (GdkWindow *window,
|
|||||||
switch (((GdkWindowObject*) window)->window_type)
|
switch (((GdkWindowObject*) window)->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP: /* ? */
|
case GDK_WINDOW_TEMP: /* ? */
|
||||||
gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
|
gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -1381,7 +1381,6 @@ gdk_window_new (GdkWindow *parent,
|
|||||||
switch (private->window_type)
|
switch (private->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
case GDK_WINDOW_OFFSCREEN:
|
case GDK_WINDOW_OFFSCREEN:
|
||||||
if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
|
if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
|
||||||
@ -1683,7 +1682,6 @@ gdk_window_reparent (GdkWindow *window,
|
|||||||
case GDK_WINDOW_OFFSCREEN:
|
case GDK_WINDOW_OFFSCREEN:
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_CHILD:
|
case GDK_WINDOW_CHILD:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
|
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
|
||||||
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
|
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
|
||||||
@ -2018,7 +2016,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
|
|||||||
/* else fall thru */
|
/* else fall thru */
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_CHILD:
|
case GDK_WINDOW_CHILD:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
case GDK_WINDOW_FOREIGN:
|
case GDK_WINDOW_FOREIGN:
|
||||||
case GDK_WINDOW_OFFSCREEN:
|
case GDK_WINDOW_OFFSCREEN:
|
||||||
|
|||||||
@ -65,7 +65,6 @@ typedef enum
|
|||||||
* screen, and is created by the window system
|
* screen, and is created by the window system
|
||||||
* @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow)
|
* @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow)
|
||||||
* @GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkEntry)
|
* @GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkEntry)
|
||||||
* @GDK_WINDOW_DIALOG: useless/deprecated compatibility type
|
|
||||||
* @GDK_WINDOW_TEMP: override redirect temporary window (used to implement
|
* @GDK_WINDOW_TEMP: override redirect temporary window (used to implement
|
||||||
* #GtkMenu)
|
* #GtkMenu)
|
||||||
* @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new())
|
* @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new())
|
||||||
@ -79,7 +78,6 @@ typedef enum
|
|||||||
GDK_WINDOW_ROOT,
|
GDK_WINDOW_ROOT,
|
||||||
GDK_WINDOW_TOPLEVEL,
|
GDK_WINDOW_TOPLEVEL,
|
||||||
GDK_WINDOW_CHILD,
|
GDK_WINDOW_CHILD,
|
||||||
GDK_WINDOW_DIALOG,
|
|
||||||
GDK_WINDOW_TEMP,
|
GDK_WINDOW_TEMP,
|
||||||
GDK_WINDOW_FOREIGN,
|
GDK_WINDOW_FOREIGN,
|
||||||
GDK_WINDOW_OFFSCREEN
|
GDK_WINDOW_OFFSCREEN
|
||||||
|
|||||||
@ -854,7 +854,6 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
switch (private->window_type)
|
switch (private->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
||||||
{
|
{
|
||||||
@ -906,10 +905,9 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
|
|
||||||
impl->view = NULL;
|
impl->view = NULL;
|
||||||
|
|
||||||
switch (attributes->window_type)
|
switch (attributes->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
{
|
{
|
||||||
NSScreen *screen;
|
NSScreen *screen;
|
||||||
|
|||||||
@ -401,17 +401,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint)
|
|||||||
klass = klassCHILD;
|
klass = klassCHILD;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
if (0 == klassDIALOG)
|
|
||||||
{
|
|
||||||
wcl.lpszClassName = L"gdkWindowDialog";
|
|
||||||
wcl.style |= CS_SAVEBITS;
|
|
||||||
ONCE_PER_CLASS ();
|
|
||||||
klassDIALOG = RegisterClassExW (&wcl);
|
|
||||||
}
|
|
||||||
klass = klassDIALOG;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if ((wtype_hint == GDK_WINDOW_TYPE_HINT_MENU) ||
|
if ((wtype_hint == GDK_WINDOW_TYPE_HINT_MENU) ||
|
||||||
(wtype_hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU) ||
|
(wtype_hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU) ||
|
||||||
@ -492,7 +481,6 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
g_print ("_gdk_window_impl_new: %s\n",
|
g_print ("_gdk_window_impl_new: %s\n",
|
||||||
(attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
|
(attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
|
||||||
(attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
|
(attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
|
||||||
(attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
|
|
||||||
(attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
|
(attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
|
||||||
"???"))))));
|
"???"))))));
|
||||||
|
|
||||||
@ -554,7 +542,6 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
switch (private->window_type)
|
switch (private->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
||||||
{
|
{
|
||||||
/* The common code warns for this case. */
|
/* The common code warns for this case. */
|
||||||
@ -1061,8 +1048,7 @@ show_window_internal (GdkWindow *window,
|
|||||||
SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST,
|
SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST,
|
||||||
0, 0, 0, 0,
|
0, 0, 0, 0,
|
||||||
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
|
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
|
||||||
else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL ||
|
else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
|
||||||
GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
|
|
||||||
{
|
{
|
||||||
if (focus_on_map && private->accept_focus)
|
if (focus_on_map && private->accept_focus)
|
||||||
{
|
{
|
||||||
@ -1399,7 +1385,6 @@ gdk_win32_window_reparent (GdkWindow *window,
|
|||||||
|
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_CHILD:
|
case GDK_WINDOW_CHILD:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (WINDOW_IS_TOPLEVEL (window))
|
if (WINDOW_IS_TOPLEVEL (window))
|
||||||
{
|
{
|
||||||
@ -1504,8 +1489,7 @@ get_effective_window_decorations (GdkWindow *window,
|
|||||||
if (gdk_window_get_decorations (window, decoration))
|
if (gdk_window_get_decorations (window, decoration))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL &&
|
if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL)
|
||||||
((GdkWindowObject *) window)->window_type != GDK_WINDOW_DIALOG)
|
|
||||||
{
|
{
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -598,12 +598,9 @@ setup_toplevel_window (GdkWindow *window,
|
|||||||
XSizeHints size_hints;
|
XSizeHints size_hints;
|
||||||
long pid;
|
long pid;
|
||||||
Window leader_window;
|
Window leader_window;
|
||||||
|
|
||||||
if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
|
|
||||||
XSetTransientForHint (xdisplay, xid, xparent);
|
|
||||||
|
|
||||||
set_wm_protocols (window);
|
set_wm_protocols (window);
|
||||||
|
|
||||||
if (!obj->input_only)
|
if (!obj->input_only)
|
||||||
{
|
{
|
||||||
/* The focus window is off the visible area, and serves to receive key
|
/* The focus window is off the visible area, and serves to receive key
|
||||||
@ -723,7 +720,6 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
switch (private->window_type)
|
switch (private->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
|
||||||
{
|
{
|
||||||
@ -809,7 +805,6 @@ _gdk_window_impl_new (GdkWindow *window,
|
|||||||
|
|
||||||
switch (GDK_WINDOW_TYPE (private))
|
switch (GDK_WINDOW_TYPE (private))
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (attributes_mask & GDK_WA_TITLE)
|
if (attributes_mask & GDK_WA_TITLE)
|
||||||
@ -1426,7 +1421,6 @@ gdk_window_x11_hide (GdkWindow *window)
|
|||||||
switch (private->window_type)
|
switch (private->window_type)
|
||||||
{
|
{
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP: /* ? */
|
case GDK_WINDOW_TEMP: /* ? */
|
||||||
gdk_window_withdraw (window);
|
gdk_window_withdraw (window);
|
||||||
return;
|
return;
|
||||||
@ -1659,7 +1653,6 @@ gdk_window_x11_reparent (GdkWindow *window,
|
|||||||
|
|
||||||
case GDK_WINDOW_TOPLEVEL:
|
case GDK_WINDOW_TOPLEVEL:
|
||||||
case GDK_WINDOW_CHILD:
|
case GDK_WINDOW_CHILD:
|
||||||
case GDK_WINDOW_DIALOG:
|
|
||||||
case GDK_WINDOW_TEMP:
|
case GDK_WINDOW_TEMP:
|
||||||
if (WINDOW_IS_TOPLEVEL (window) &&
|
if (WINDOW_IS_TOPLEVEL (window) &&
|
||||||
impl->toplevel)
|
impl->toplevel)
|
||||||
|
|||||||
Reference in New Issue
Block a user