X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ec2eca1e8c2829b34bfc95a10cc3c6ab4798314..4521f6c88cbefa7f13e3733d344776b795f981e4:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index d57145134e..8f41635cf2 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2,7 +2,6 @@ // Name: src/gtk/window.cpp // Purpose: wxWindowGTK implementation // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -755,10 +754,10 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, KeySym keysym = gdk_event->keyval; - wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %ld"), + wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %lu"), event.GetEventType() == wxEVT_KEY_UP ? wxT("release") : wxT("press"), - keysym); + static_cast(keysym)); long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */); @@ -1615,100 +1614,121 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget), // "scroll_event" (mouse wheel event) //----------------------------------------------------------------------------- -static gboolean -window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) +static void AdjustRangeValue(GtkRange* range, double step) { - if (gdk_event->direction != GDK_SCROLL_LEFT && - gdk_event->direction != GDK_SCROLL_RIGHT) - { - return false; - } - - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; - if (range && gtk_widget_get_visible(GTK_WIDGET(range))) { GtkAdjustment* adj = gtk_range_get_adjustment(range); - double delta = gtk_adjustment_get_step_increment(adj) * 3; - if (gdk_event->direction == GDK_SCROLL_LEFT) - delta = -delta; - - gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); - - return TRUE; + double value = gtk_adjustment_get_value(adj); + value += step * gtk_adjustment_get_step_increment(adj); + gtk_range_set_value(range, value); } - - return FALSE; } static gboolean -window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) +scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win) { wxMouseEvent event(wxEVT_MOUSEWHEEL); InitMouseEvent(win, event, gdk_event); - // FIXME: Get these values from GTK or GDK + event.m_wheelDelta = 120; event.m_linesPerAction = 3; event.m_columnsPerAction = 3; - event.m_wheelDelta = 120; - // Determine the scroll direction. - switch (gdk_event->direction) + GtkRange* range_h = win->m_scrollBar[wxWindow::ScrollDir_Horz]; + GtkRange* range_v = win->m_scrollBar[wxWindow::ScrollDir_Vert]; + const bool is_range_h = (void*)widget == range_h; + const bool is_range_v = (void*)widget == range_v; + GdkScrollDirection direction = gdk_event->direction; + switch (direction) { case GDK_SCROLL_UP: - case GDK_SCROLL_RIGHT: - event.m_wheelRotation = 120; + if (is_range_h) + direction = GDK_SCROLL_LEFT; break; - case GDK_SCROLL_DOWN: + if (is_range_h) + direction = GDK_SCROLL_RIGHT; + break; case GDK_SCROLL_LEFT: - event.m_wheelRotation = -120; + if (is_range_v) + direction = GDK_SCROLL_UP; + break; + case GDK_SCROLL_RIGHT: + if (is_range_v) + direction = GDK_SCROLL_DOWN; + break; + default: break; #if GTK_CHECK_VERSION(3,4,0) case GDK_SCROLL_SMOOTH: - // TODO -#endif - default: - return false; // Unknown/unhandled direction + double delta_x = gdk_event->delta_x; + double delta_y = gdk_event->delta_y; + if (delta_x == 0) + { + if (is_range_h) + { + delta_x = delta_y; + delta_y = 0; + } + } + else if (delta_y == 0) + { + if (is_range_v) + { + delta_y = delta_x; + delta_x = 0; + } + } + if (delta_x) + { + event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; + event.m_wheelRotation = int(event.m_wheelDelta * delta_x); + if (!win->GTKProcessEvent(event)) + AdjustRangeValue(range_h, event.m_columnsPerAction * delta_x); + } + if (delta_y) + { + event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; + event.m_wheelRotation = int(event.m_wheelDelta * -delta_y); + if (!win->GTKProcessEvent(event)) + AdjustRangeValue(range_v, event.m_linesPerAction * delta_y); + } + return true; +#endif // GTK_CHECK_VERSION(3,4,0) } - - // And the scroll axis. - switch (gdk_event->direction) + GtkRange *range; + double step; + switch (direction) { case GDK_SCROLL_UP: case GDK_SCROLL_DOWN: + range = range_v; event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; + step = event.m_linesPerAction; break; - case GDK_SCROLL_LEFT: case GDK_SCROLL_RIGHT: + range = range_h; event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; + step = event.m_columnsPerAction; break; -#if GTK_CHECK_VERSION(3,4,0) - case GDK_SCROLL_SMOOTH: - // TODO - break; -#endif + default: + return false; } - if (win->GTKProcessEvent(event)) - return TRUE; + event.m_wheelRotation = event.m_wheelDelta; + if (direction == GDK_SCROLL_DOWN || direction == GDK_SCROLL_LEFT) + event.m_wheelRotation = -event.m_wheelRotation; - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; - - if (range && gtk_widget_get_visible(GTK_WIDGET(range))) + if (!win->GTKProcessEvent(event)) { - GtkAdjustment* adj = gtk_range_get_adjustment(range); - double delta = gtk_adjustment_get_step_increment(adj) * 3; - if (gdk_event->direction == GDK_SCROLL_UP) - delta = -delta; - - gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); - - return TRUE; + if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_LEFT) + step = -step; + AdjustRangeValue(range, step); } - return FALSE; + return true; } //----------------------------------------------------------------------------- @@ -1928,9 +1948,11 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) GtkAllocation a; gtk_widget_get_allocation(win->m_widget, &a); // update position for widgets in native containers, such as wxToolBar - // (for widgets in a wxPizza, the values should already be the same) - win->m_x = a.x; - win->m_y = a.y; + if (!WX_IS_PIZZA(gtk_widget_get_parent(win->m_widget))) + { + win->m_x = a.x; + win->m_y = a.y; + } win->m_useCachedClientSize = true; if (win->m_clientWidth != w || win->m_clientHeight != h) { @@ -2424,9 +2446,6 @@ wxWindowGTK::~wxWindowGTK() // destroy children before destroying this window itself DestroyChildren(); - if (m_widget) - Show( false ); - // delete before the widgets to avoid a crash on solaris if ( m_imContext ) { @@ -2638,14 +2657,13 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) g_signal_connect (widget, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); - g_signal_connect (widget, "scroll_event", - G_CALLBACK (window_scroll_event), this); - if (m_scrollBar[ScrollDir_Horz]) - g_signal_connect (m_scrollBar[ScrollDir_Horz], "scroll_event", - G_CALLBACK (window_scroll_event_hscrollbar), this); - if (m_scrollBar[ScrollDir_Vert]) - g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event", - G_CALLBACK (window_scroll_event), this); + g_signal_connect(widget, "scroll_event", G_CALLBACK(scroll_event), this); + GtkRange* range = m_scrollBar[ScrollDir_Horz]; + if (range) + g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this); + range = m_scrollBar[ScrollDir_Vert]; + if (range) + g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this); g_signal_connect (widget, "popup_menu", G_CALLBACK (wxgtk_window_popup_menu_callback), this); @@ -3376,6 +3394,8 @@ void wxWindowGTK::SetFocus() void wxWindowGTK::SetCanFocus(bool canFocus) { + wxCHECK_RET(m_widget, "invalid window"); + gtk_widget_set_can_focus(m_widget, canFocus); if ( m_wxwindow && (m_widget != m_wxwindow) ) @@ -4367,6 +4387,13 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) gtk_get_current_event_time() ); + // it is possible for gtk_menu_popup() to fail + if (!gtk_widget_get_visible(GTK_WIDGET(menu->m_menu))) + { + menu->m_popupShown = false; + return false; + } + while (menu->m_popupShown) { gtk_main_iteration(); @@ -4596,7 +4623,9 @@ int wxWindowGTK::GetScrollRange( int orient ) const // difference due to possible inexactness in floating point arithmetic static inline bool IsScrollIncrement(double increment, double x) { - wxASSERT(increment > 0); + wxASSERT(increment >= 0); + if ( increment == 0. ) + return false; const double tolerance = 1.0 / 1024; return fabs(increment - fabs(x)) < tolerance; }