Mercurial > pidgin
changeset 6423:9281be45e046
[gaim-migrate @ 6931]
gtk_window_move is now fixed in gtk-2-2 branch
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Mon, 11 Aug 2003 17:48:58 +0000 |
| parents | 468bbb5fbc29 |
| children | 8e7f1662d802 |
| files | src/win32/win32dep.c src/win32/win32dep.h |
| diffstat | 2 files changed, 0 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/win32/win32dep.c Mon Aug 11 17:44:50 2003 +0000 +++ b/src/win32/win32dep.c Mon Aug 11 17:48:58 2003 +0000 @@ -136,34 +136,6 @@ return ret; } -/* - * This is a hack to circumvent the conflict between the - * windows behaviour of gtk_window_get_pos and gtk_window_move, which - * exists in GTK+ v2.2.0. GTK+ documentation explains the following - * should be true for gtk_window_get_pos: - * This function returns the position you need to pass to - * gtk_window_move() to keep window in its current position. - * This is false (for windows). gtk_window_get_pos returns - * client coords, whereas gtk_window_move accepts non-client coords. - * Our solution, until this is fixed, is to anticipate the offset and - * adjust the coordinates passed to gtk_window_move. - */ -void wgaim_gtk_window_move(GtkWindow *window, gint x, gint y) { - LONG style, extended_style; - RECT trect; - HWND hWnd; - - if(!GTK_WIDGET_REALIZED(GTK_WIDGET(window))) - gtk_widget_realize(GTK_WIDGET(window)); - hWnd = GDK_WINDOW_HWND(GTK_WIDGET(window)->window); - style = GetWindowLong(hWnd, GWL_STYLE); - extended_style = GetWindowLong (hWnd, GWL_EXSTYLE); - GetClientRect (hWnd, &trect); - AdjustWindowRectEx (&trect, style, FALSE, extended_style); - gtk_window_move(window, x + (-1 * trect.left), y + (-1 * trect.top)); -} - - /* Determine whether the specified dll contains the specified procedure. If so, load it (if not already loaded). */ FARPROC wgaim_find_and_loadproc( char* dllname, char* procedure ) {
--- a/src/win32/win32dep.h Mon Aug 11 17:44:50 2003 +0000 +++ b/src/win32/win32dep.h Mon Aug 11 17:48:58 2003 +0000 @@ -68,9 +68,5 @@ #define LIBDIR wgaim_lib_dir() #define LOCALEDIR wgaim_locale_dir() -/* Temp solution for gtk_window_get_pos & gtk_window_move conflict */ -#define gtk_window_move( window, x, y ) \ -wgaim_gtk_window_move( ## window ##, ## x ##, ## y ## ) - #endif /* _WIN32DEP_H_ */