AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the long deprecated GDK_WINDOW_DIALOG type.

Browse Source 
This has been deprecated forever, and was just left in for
compatibility reasons.
This commit is contained in:
Matthias Clasen 2010-08-28 20:10:02 -04:00
parent 00438fea3d
commit eb10e6b128
6 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdkevents.c
View File

@ -1445,7 +1445,6 @@ gdk_synthesize_window_state (GdkWindow *window,
switch (((GdkWindowObject*) window)->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP: /* ? */
gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
break;

3
gdk/gdkwindow.c
View File

@ -1381,7 +1381,6 @@ gdk_window_new (GdkWindow *parent,
switch (private->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
case GDK_WINDOW_OFFSCREEN:
if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
@ -1683,7 +1682,6 @@ gdk_window_reparent (GdkWindow *window,
case GDK_WINDOW_OFFSCREEN:
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_CHILD:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
@ -2018,7 +2016,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
/* else fall thru */
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_CHILD:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
case GDK_WINDOW_FOREIGN:
case GDK_WINDOW_OFFSCREEN:

2
gdk/gdkwindow.h
View File

@ -65,7 +65,6 @@ typedef enum
* screen, and is created by the window system
* @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow)
* @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
* #GtkMenu)
* @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new())
@ -79,7 +78,6 @@ typedef enum
GDK_WINDOW_ROOT,
GDK_WINDOW_TOPLEVEL,
GDK_WINDOW_CHILD,
GDK_WINDOW_DIALOG,
GDK_WINDOW_TEMP,
GDK_WINDOW_FOREIGN,
GDK_WINDOW_OFFSCREEN

4
gdk/quartz/gdkwindow-quartz.c
View File

@ -854,7 +854,6 @@ _gdk_window_impl_new (GdkWindow *window,
switch (private->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
{
@ -906,10 +905,9 @@ _gdk_window_impl_new (GdkWindow *window,
impl->view = NULL;
switch (attributes->window_type)
switch (attributes->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
{
NSScreen *screen;

20
gdk/win32/gdkwindow-win32.c
View File

@ -401,17 +401,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint)
klass = klassCHILD;
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:
if ((wtype_hint == GDK_WINDOW_TYPE_HINT_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",
(attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
(attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
(attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
(attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
"???"))))));
@ -554,7 +542,6 @@ _gdk_window_impl_new (GdkWindow *window,
switch (private->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
{
/* The common code warns for this case. */
@ -1061,8 +1048,7 @@ show_window_internal (GdkWindow *window,
SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST,
0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL ||
GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
{
if (focus_on_map && private->accept_focus)
{
@ -1399,7 +1385,6 @@ gdk_win32_window_reparent (GdkWindow *window,
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_CHILD:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
if (WINDOW_IS_TOPLEVEL (window))
{
@ -1504,8 +1489,7 @@ get_effective_window_decorations (GdkWindow *window,
if (gdk_window_get_decorations (window, decoration))
return TRUE;
if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL &&
((GdkWindowObject *) window)->window_type != GDK_WINDOW_DIALOG)
if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL)
{
return FALSE;
}

11
gdk/x11/gdkwindow-x11.c
View File

@ -598,12 +598,9 @@ setup_toplevel_window (GdkWindow *window,
XSizeHints size_hints;
long pid;
Window leader_window;
if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
XSetTransientForHint (xdisplay, xid, xparent);
set_wm_protocols (window);
if (!obj->input_only)
{
/* 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)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
{
@ -809,7 +805,6 @@ _gdk_window_impl_new (GdkWindow *window,
switch (GDK_WINDOW_TYPE (private))
{
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_TEMP:
if (attributes_mask & GDK_WA_TITLE)
@ -1426,7 +1421,6 @@ gdk_window_x11_hide (GdkWindow *window)
switch (private->window_type)
{
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP: /* ? */
gdk_window_withdraw (window);
return;
@ -1659,7 +1653,6 @@ gdk_window_x11_reparent (GdkWindow *window,
case GDK_WINDOW_TOPLEVEL:
case GDK_WINDOW_CHILD:
case GDK_WINDOW_DIALOG:
case GDK_WINDOW_TEMP:
if (WINDOW_IS_TOPLEVEL (window) &&
impl->toplevel)