X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3f0d961af5454a3544a4f4f9aced750d4641d69..60848fcfefa649f4e1275281639881452374a350:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index dc03fbe4b3..1fe395f33c 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1537,6 +1537,20 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, wxEventType event_type = wxEVT_NULL; + // GdkDisplay is a GTK+ 2.1.0 thing +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0) + if ( gdk_event->type == GDK_2BUTTON_PRESS && + gdk_event->button >= 1 && gdk_event->button <= 3 ) + { + // Reset GDK internal timestamp variables in order to disable GDK + // triple click events. GDK will then next time believe no button has + // been clicked just before, and send a normal button click event. + GdkDisplay* display = gtk_widget_get_display (widget); + display->button_click_time[1] = 0; + display->button_click_time[0] = 0; + } +#endif // GTK 2+ + if (gdk_event->button == 1) { // note that GDK generates triple click events which are not supported @@ -1544,6 +1558,10 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, // clicks would simply go missing switch (gdk_event->type) { + // we shouldn't get triple clicks at all for GTK2 because we + // suppress them artificially using the code above but we still + // should map them to something for GTK1 and not just ignore them + // as this would lose clicks case GDK_3BUTTON_PRESS: // we could also map this to DCLICK... case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; @@ -1552,12 +1570,17 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, case GDK_2BUTTON_PRESS: event_type = wxEVT_LEFT_DCLICK; break; + + default: + // just to silence gcc warnings + ; } } else if (gdk_event->button == 2) { switch (gdk_event->type) { + case GDK_3BUTTON_PRESS: case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break; @@ -1565,12 +1588,16 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, case GDK_2BUTTON_PRESS: event_type = wxEVT_MIDDLE_DCLICK; break; + + default: + ; } } else if (gdk_event->button == 3) { switch (gdk_event->type) { + case GDK_3BUTTON_PRESS: case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break; @@ -1578,6 +1605,9 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, case GDK_2BUTTON_PRESS: event_type = wxEVT_RIGHT_DCLICK; break; + + default: + ; } } else if (gdk_event->button == 4 || gdk_event->button == 5) @@ -2760,10 +2790,8 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const w { wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") ); - // This turns -1 into 30 so that a minimal window is - // visible even although -1,-1 has been given as the - // size of the window. the same trick is used in other - // ports and should make debugging easier. + // Use either the given size, or the default if -1 is given. + // See wxWindowBase for these functions. m_width = WidthDefault(size.x) ; m_height = HeightDefault(size.y);