summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/win32')
-rw-r--r--gdk/win32/gdkdevicemanager-win32.c7
-rw-r--r--gdk/win32/gdkdisplay-win32.c2
-rw-r--r--gdk/win32/gdkdrag-win32.c7
-rw-r--r--gdk/win32/gdkprivate-win32.h8
-rw-r--r--gdk/win32/gdksurface-win32.c71
5 files changed, 22 insertions, 73 deletions
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index d12666eed9..66f2474cac 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -428,10 +428,9 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
#endif
/* Create a dummy window to receive wintab events */
wintab_window =
- _gdk_win32_display_create_surface (display,
- GDK_SURFACE_TEMP,
- NULL,
- -100, -100, 2, 2);
+ gdk_win32_display_create_surface (display,
+ GDK_SURFACE_TEMP,
+ NULL);
g_object_ref (wintab_window);
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 223f1b47c5..49952bcbca 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1169,7 +1169,7 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
display_class->get_next_serial = gdk_win32_display_get_next_serial;
display_class->notify_startup_complete = gdk_win32_display_notify_startup_complete;
- display_class->create_surface = _gdk_win32_display_create_surface;
+ display_class->create_surface = gdk_win32_display_create_surface;
display_class->get_keymap = _gdk_win32_display_get_keymap;
display_class->make_gl_context_current = _gdk_win32_display_make_gl_context_current;
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index df81a73cec..da3e67a6d0 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -1700,10 +1700,9 @@ create_drag_surface (GdkDisplay *display)
{
GdkSurface *surface;
- surface = _gdk_win32_display_create_surface (display,
- GDK_SURFACE_TEMP,
- NULL,
- 0, 0, 100, 100);
+ surface = gdk_win32_display_create_surface (display,
+ GDK_SURFACE_TEMP,
+ NULL);
return surface;
}
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index d37866bcf3..32c089d67e 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -379,13 +379,9 @@ void _gdk_win32_keymap_set_active_layout (GdkWin32Keymap *keymap,
GdkKeymap *_gdk_win32_display_get_keymap (GdkDisplay *display);
-GdkSurface *_gdk_win32_display_create_surface (GdkDisplay *display,
+GdkSurface *gdk_win32_display_create_surface (GdkDisplay *display,
GdkSurfaceType surface_type,
- GdkSurface *parent,
- int x,
- int y,
- int width,
- int height);
+ GdkSurface *parent);
/* stray GdkSurfaceImplWin32 members */
void _gdk_win32_surface_register_dnd (GdkSurface *window);
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index c7736c9cc6..027af2437a 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -449,13 +449,9 @@ RegisterGdkClass (GdkSurfaceType wtype)
* [1] http://mail.gnome.org/archives/gtk-devel-list/2010-August/msg00214.html
*/
GdkSurface *
-_gdk_win32_display_create_surface (GdkDisplay *display,
- GdkSurfaceType surface_type,
- GdkSurface *parent,
- int x,
- int y,
- int width,
- int height)
+gdk_win32_display_create_surface (GdkDisplay *display,
+ GdkSurfaceType surface_type,
+ GdkSurface *parent)
{
HWND hwndNew;
HANDLE owner;
@@ -467,11 +463,8 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
GdkSurface *surface;
const char *title;
wchar_t *wtitle;
- int window_width, window_height;
- int window_x, window_y;
- int offset_x = 0, offset_y = 0;
- int real_x = 0, real_y = 0;
GdkFrameClock *frame_clock;
+ int x, y;
g_return_val_if_fail (display == _gdk_display, NULL);
@@ -494,6 +487,8 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
"display", display,
"frame-clock", frame_clock,
NULL);
+ x = CW_USEDEFAULT;
+ y = CW_USEDEFAULT;
break;
case GDK_SURFACE_POPUP:
impl = g_object_new (GDK_TYPE_WIN32_POPUP,
@@ -501,12 +496,16 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
"display", display,
"frame-clock", frame_clock,
NULL);
+ x = 0;
+ y = 0;
break;
case GDK_SURFACE_TEMP:
impl = g_object_new (GDK_TYPE_WIN32_DRAG_SURFACE,
"display", display,
"frame-clock", frame_clock,
NULL);
+ x = -100;
+ y = -100;
break;
default:
g_assert_not_reached ();
@@ -514,18 +513,12 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
}
surface = GDK_SURFACE (impl);
- surface->x = x;
- surface->y = y;
- surface->width = width;
- surface->height = height;
impl->surface_scale = _gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL, NULL);
dwExStyle = 0;
owner = NULL;
- offset_x = _gdk_offset_x;
- offset_y = _gdk_offset_y;
/* MSDN: We need WS_CLIPCHILDREN and WS_CLIPSIBLINGS for GL Context Creation */
dwStyle = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
@@ -550,32 +543,6 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
g_assert_not_reached ();
}
- rect.left = x * impl->surface_scale;
- rect.top = y * impl->surface_scale;
- rect.right = rect.left + width * impl->surface_scale;
- rect.bottom = rect.top + height * impl->surface_scale;
-
- AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-
- real_x = (x - offset_x) * impl->surface_scale;
- real_y = (y - offset_y) * impl->surface_scale;
-
- if (surface_type == GDK_SURFACE_TOPLEVEL)
- {
- /* We initially place it at default so that we can get the
- default window positioning if we want */
- window_x = window_y = CW_USEDEFAULT;
- }
- else
- {
- /* TEMP: Put these where requested */
- window_x = real_x;
- window_y = real_y;
- }
-
- window_width = rect.right - rect.left;
- window_height = rect.bottom - rect.top;
-
title = get_default_title ();
if (!title || !*title)
title = "";
@@ -594,8 +561,8 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
MAKEINTRESOURCEW (klass),
wtitle,
dwStyle,
- window_x, window_y,
- window_width, window_height,
+ x, y,
+ CW_USEDEFAULT, CW_USEDEFAULT,
owner,
NULL,
_gdk_dll_hinstance,
@@ -606,15 +573,6 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
impl->initial_x = rect.left;
impl->initial_y = rect.top;
- /* Now we know the initial position, move to actually specified position */
- if (real_x != window_x || real_y != window_y)
- {
- API_CALL (SetWindowPos, (hwndNew,
- SWP_NOZORDER_SPECIFIED,
- real_x, real_y, 0, 0,
- SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER));
- }
-
g_object_ref (impl);
/* Take note: we're inserting a pointer into a heap-allocated
* object (impl). Inserting a pointer to a stack variable
@@ -626,11 +584,8 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
*/
gdk_win32_handle_table_insert (&GDK_SURFACE_HWND (impl), impl);
- GDK_NOTE (MISC, g_print ("... \"%s\" %dx%d@%+d%+d %p = %p\n",
+ GDK_NOTE (MISC, g_print ("... \"%s\" %p = %p\n",
title,
- window_width, window_height,
- surface->x - offset_x,
- surface->y - offset_y,
owner,
hwndNew));
View Lorry Controller Status