From c9dabae939037adb245b61598ca8770578589243 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sat, 10 Nov 2001 13:23:36 +0000 Subject: [PATCH] make sure we know what we are talking about when asked for MINMAXINFO. 2001-11-10 Hans Breuer * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure we know what we are talking about when asked for MINMAXINFO. Also some cleaning for !HAVE_DIMM_H etc. --- ChangeLog | 8 +++++++- ChangeLog.pre-2-0 | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-2 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- gdk/win32/gdkevents-win32.c | 14 ++++++++++++++ 8 files changed, 63 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4e3b6f22eb..49682fcfae 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-11-10 Hans Breuer + + * gdk/win32/gdkevents-win32.c (gdk_event_translate) : make sure + we know what we are talking about when asked for MINMAXINFO. + Also some cleaning for !HAVE_DIMM_H etc. + 2001-11-10 Matthias Clasen * gtk/gtktreeviewcolumn.c: Fix docs for @@ -8,7 +14,7 @@ * gtk/gtkcolorsel.c: Documentation fixes. -2001-10-28 Hans Breuer +2001-11-10 Hans Breuer * gtk/gtkfontsel.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 1f52166f42..6ffb91436d 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -156,7 +156,9 @@ real_window_procedure (HWND hwnd, GdkEvent *eventp; MSG msg; DWORD pos; +#ifdef HAVE_DIMM_H LRESULT lres; +#endif gint ret_val; gboolean ret_val_flag; @@ -293,7 +295,9 @@ void _gdk_events_init (void) { GSource *source; +#ifdef HAVE_DIMM_H HRESULT hres; +#endif #ifdef USE_TRACKMOUSEEVENT HMODULE user32, imm32; HINSTANCE commctrl32; @@ -2931,6 +2935,16 @@ gdk_event_translate (GdkEvent *event, mmi->ptMaxSize.x = MIN(window_impl->hint_max_width, gdk_screen_width ()); mmi->ptMaxSize.y = MIN(window_impl->hint_max_height, gdk_screen_height ()); } + else if (window_impl->hint_flags & GDK_HINT_MIN_SIZE) + { + /* need to initialize */ + mmi->ptMaxSize.x = gdk_screen_width (); + mmi->ptMaxSize.y = gdk_screen_height (); + } + /* lovely API inconsistence: return FALSE when handled */ + if (ret_val_flagp) + *ret_val_flagp = !(window_impl->hint_flags & + (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE)); break; case WM_MOVE: