diff --git a/ChangeLog b/ChangeLog index 254be55146..ab87a861c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 254be55146..ab87a861c5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 254be55146..ab87a861c5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 254be55146..ab87a861c5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 254be55146..ab87a861c5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 254be55146..ab87a861c5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -48,7 +48,7 @@ (gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose): Call gdk_window_queue_append(). - Merge from gtk-1-3-win32-production branch: + Merge from gtk-1-3-win32-production and gtk-2-0: * gdk/win32/gdkevents-win32.c (propagate): Check for parent being NULL before trying to propagate to it, and return FALSE in that @@ -56,6 +56,15 @@ probably should have noticed that and bailed out earlier. But better late than never.) + * gdk/win32/gdkinput-win32.c (gdk_input_init): Use + GetSystemMetrics (SM_C[XY]SCREEN) instead of + gdk_screen_{width,height}(). + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't + use return value from GlobalSize() as length of string when + calling MultiByteToWideChar(). Pass -1 instead (zero-terminated + string). Thanks to Iwasa Kazmi. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c index 0084fa2cbe..55e0e9d217 100644 --- a/gdk/win32/gdkinput-win32.c +++ b/gdk/win32/gdkinput-win32.c @@ -566,8 +566,8 @@ gdk_input_translate_coordinates (GdkDevicePrivate *gdkdev, if (gdkdev->info.mode == GDK_MODE_SCREEN) { - x_scale = gdk_screen_width() / device_width; - y_scale = gdk_screen_height() / device_height; + x_scale = GetSystemMetrics (SM_CXSCREEN) / device_width; + y_scale = GetSystemMetrics (SM_CYSCREEN) / device_height; x_offset = - input_window->root_x; y_offset = - input_window->root_y; diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index fcbd5cb599..ffe6199cfc 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -394,7 +394,7 @@ gdk_selection_convert (GdkWindow *requestor, } wcs = g_new (wchar_t, length + 1); - wclen = MultiByteToWideChar (cp, 0, ptr, length, + wclen = MultiByteToWideChar (cp, 0, ptr, -1, wcs, length + 1); /* Strip out \r */