gdk: Rename GDK_SURFACE_TEMP

We use this value only for drag surfaces, so call it that.

diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index ac1da88ff95212162545c015f680801077adc3bf..a29b5f26016cbd56fc9dfe4d27dcf7a47d7ed95f 100644 (file)
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -239,7 +239,7 @@ _gdk_broadway_display_create_surface (GdkDisplay     *display,
     case GDK_SURFACE_POPUP:
       type = GDK_TYPE_BROADWAY_POPUP;
       break;
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       type = GDK_TYPE_BROADWAY_DRAG_SURFACE;
       break;
     default:
@@ -1115,7 +1115,7 @@ create_moveresize_surface (MoveResizeData *mv_resize,
 
   mv_resize->moveresize_emulation_surface =
       _gdk_broadway_display_create_surface (mv_resize->display,
-                                            GDK_SURFACE_TEMP,
+                                            GDK_SURFACE_DRAG,
                                             NULL,
                                             -100, -100, 1, 1);
 

diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index c53368574d4d84f5760f20b87736d5f02814b11b..a4e0e751ab56dc87e63832767de229ac83c702c5 100644 (file)
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -30,8 +30,8 @@ G_BEGIN_DECLS
 typedef enum
 {
   GDK_SURFACE_TOPLEVEL,
-  GDK_SURFACE_TEMP,
-  GDK_SURFACE_POPUP
+  GDK_SURFACE_POPUP,
+  GDK_SURFACE_DRAG
 } GdkSurfaceType;
 
 struct _GdkSurface

diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index b847ea0ff4cccfdd820340456a8f8e7a301367c4..00a33975d4fbdc9aae5585e9b387f95cbcc70724 100644 (file)
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -436,7 +436,7 @@ gdk_macos_surface_drag_begin (GdkSurface         *surface,
   gdk_macos_device_query_state (device, surface, NULL, &px, &py, NULL);
   _gdk_macos_surface_get_root_coords (GDK_MACOS_SURFACE (surface), &sx, &sy);
   drag_surface = _gdk_macos_surface_new (GDK_MACOS_DISPLAY (surface->display),
-                                         GDK_SURFACE_TEMP,
+                                         GDK_SURFACE_DRAG,
                                          surface,
                                          sx, sy, 1, 1);
   drag = g_object_new (GDK_TYPE_MACOS_DRAG,
@@ -646,7 +646,7 @@ _gdk_macos_surface_new (GdkMacosDisplay   *display,
       ret = _gdk_macos_popup_surface_new (display, parent, frame_clock, x, y, width, height);
       break;
 
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       ret = _gdk_macos_drag_surface_new (display, frame_clock, x, y, width, height);
       break;
 

diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index a6ea68f8ccb09a4b9b8a424f3c82933f0bb744bb..fb2842b44765e966716ff261dd61937926e1f307 100644 (file)
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -852,7 +852,7 @@ _gdk_wayland_display_create_surface (GdkDisplay     *display,
                               "frame-clock", frame_clock,
                               NULL);
       break;
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       surface = g_object_new (GDK_TYPE_WAYLAND_DRAG_SURFACE,
                               "display", display,
                               "frame-clock", frame_clock,
@@ -4811,7 +4811,7 @@ create_dnd_surface (GdkDisplay *display)
   GdkSurface *surface;
 
   surface = _gdk_wayland_display_create_surface (display,
-                                                 GDK_SURFACE_TEMP,
+                                                 GDK_SURFACE_DRAG,
                                                  NULL,
                                                  0, 0, 100, 100);
 

diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index e5becd265fb854a94568fc914b90145bcb495120..c7302745fde38eaefa75ef1d8a47acc718358b42 100644 (file)
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -429,7 +429,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
   /* Create a dummy window to receive wintab events */
   wintab_window =
       _gdk_win32_display_create_surface (display,
-                                         GDK_SURFACE_TEMP,
+                                         GDK_SURFACE_DRAG,
                                          NULL,
                                          -100, -100, 2, 2);
 

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index d3fd992b134c39ce895d5295fc0dbfb9043b444b..679d80db6f55fdcc14de65d1b0f559c728f88b7a 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -1652,7 +1652,7 @@ create_drag_surface (GdkDisplay *display)
   GdkSurface *surface;
 
   surface = _gdk_win32_display_create_surface (display,
-                                               GDK_SURFACE_TEMP,
+                                               GDK_SURFACE_DRAG,
                                                NULL,
                                                0, 0, 100, 100);
 

diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 3aae19186c551cda043536c048ac11f687537715..5a32e78f3047fc6f50677172b15d4b45eddd66c7 100644 (file)
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -421,7 +421,7 @@ RegisterGdkClass (GdkSurfaceType wtype)
       klass = klassTOPLEVEL;
       break;
 
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       if (klassTEMP == 0)
         {
           wcl.lpszClassName = L"gdkSurfaceTemp";
@@ -486,8 +486,8 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
 
   GDK_NOTE (MISC,
             g_print ("_gdk_surface_new: %s\n", (surface_type == GDK_SURFACE_TOPLEVEL ? "TOPLEVEL" :
-                                                       (surface_type == GDK_SURFACE_TEMP ? "TEMP" :
-                                                      (surface_type == GDK_SURFACE_TEMP ? "POPUP" : "???")))));
+                                                       (surface_type == GDK_SURFACE_DRAG? "TEMP" :
+                                                      (surface_type == GDK_SURFACE_DRAG ? "POPUP" : "???")))));
 
   display_win32 = GDK_WIN32_DISPLAY (display);
 
@@ -511,7 +511,7 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
                            "frame-clock", frame_clock,
                            NULL);
       break;
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       impl = g_object_new (GDK_TYPE_WIN32_DRAG_SURFACE,
                            "display", display,
                            "frame-clock", frame_clock,
@@ -542,7 +542,7 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
       dwStyle |= WS_OVERLAPPEDWINDOW;
       break;
 
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       dwExStyle |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
       /* fall through */
     case GDK_SURFACE_POPUP:
@@ -646,7 +646,7 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
 
   gdk_surface_set_egl_native_window (surface, (void *) impl->handle);
 
-  if (surface_type != GDK_SURFACE_TEMP)
+  if (surface_type != GDK_SURFACE_DRAG)
     {
       if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER)
         gdk_winpointer_initialize_surface (surface);

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 18b808e544c9c49c2bf86f9f2970788251dd6e36..e9e1b766d66ce63e27ef9a1c0fa332ea6cd84479 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1393,7 +1393,7 @@ gdk_x11_display_init_leader_surface (GdkX11Display *self)
 
   self->leader_gdk_surface =
       _gdk_x11_display_create_surface (display,
-                                       GDK_SURFACE_TEMP,
+                                       GDK_SURFACE_DRAG,
                                        NULL,
                                        -100, -100, 1, 1);
 

diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 9ed967e88678eb26a881a0fd619c92faa743f552..7a58f690ae87804be9a1f522919243d3a59024f4 100644 (file)
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -1261,7 +1261,7 @@ create_drag_surface (GdkDisplay *display)
   GdkSurface *surface;
 
   surface = _gdk_x11_display_create_surface (display,
-                                             GDK_SURFACE_TEMP,
+                                             GDK_SURFACE_DRAG,
                                              NULL,
                                              0, 0, 100, 100);
 
@@ -2027,7 +2027,7 @@ _gdk_x11_surface_drag_begin (GdkSurface         *surface,
   display = gdk_surface_get_display (surface);
 
   ipc_surface = _gdk_x11_display_create_surface (display,
-                                                 GDK_SURFACE_TEMP,
+                                                 GDK_SURFACE_DRAG,
                                                  NULL,
                                                  -99, -99, 1, 1);
 

diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 3bf6936e9a347acec7b131fb3fd9fd6fdf0cec48..b77cd2e3ad7b480ae47caa41421fc1ed1a1f6a71 100644 (file)
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -1194,7 +1194,7 @@ _gdk_x11_display_create_surface (GdkDisplay     *display,
                               "frame-clock", frame_clock,
                               NULL);
       break;
-    case GDK_SURFACE_TEMP:
+    case GDK_SURFACE_DRAG:
       surface = g_object_new (GDK_TYPE_X11_DRAG_SURFACE,
                               "display", display,
                               "frame-clock", frame_clock,
@@ -1233,7 +1233,7 @@ _gdk_x11_display_create_surface (GdkDisplay     *display,
   xattributes.colormap = gdk_x11_display_get_window_colormap (display_x11);
   xattributes_mask |= CWColormap;
 
-  if (surface_type == GDK_SURFACE_TEMP ||
+  if (surface_type == GDK_SURFACE_DRAG ||
       surface_type == GDK_SURFACE_POPUP)
     {
       xattributes.save_under = True;
@@ -4371,7 +4371,7 @@ create_moveresize_surface (MoveResizeData *mv_resize,
 
   mv_resize->moveresize_emulation_surface =
       _gdk_x11_display_create_surface (mv_resize->display,
-                                       GDK_SURFACE_TEMP,
+                                       GDK_SURFACE_DRAG,
                                        NULL,
                                        -100, -100, 1, 1);