X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa9873106ea8e6ee90f8811bae4d06485e42ba6..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index a264041af7..81b957556c 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 */); @@ -961,7 +960,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), int command = ancestor->GetAcceleratorTable()->GetCommand( event ); if (command != -1) { - wxCommandEvent menu_event( wxEVT_COMMAND_MENU_SELECTED, command ); + wxCommandEvent menu_event( wxEVT_MENU, command ); ret = ancestor->HandleWindowEvent( menu_event ); if ( !ret ) @@ -969,7 +968,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), // if the accelerator wasn't handled as menu event, try // it as button click (for compatibility with other // platforms): - wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command ); + wxCommandEvent button_event( wxEVT_BUTTON, command ); ret = ancestor->HandleWindowEvent( button_event ); } @@ -1069,24 +1068,32 @@ static void gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), const gchar *str, wxWindow *window) +{ + // Ignore the return value here, it doesn't matter for the "commit" signal. + window->GTKDoInsertTextFromIM(str); +} +} + +bool wxWindowGTK::GTKDoInsertTextFromIM(const char* str) { wxKeyEvent event( wxEVT_CHAR ); // take modifiers, cursor position, timestamp etc. from the last // key_press_event that was fed into Input Method: - if (window->m_imKeyEvent) + if ( m_imKeyEvent ) { - wxFillOtherKeyEventFields(event, window, window->m_imKeyEvent); + wxFillOtherKeyEventFields(event, this, m_imKeyEvent); } else { - event.SetEventObject( window ); + event.SetEventObject(this); } const wxString data(wxGTK_CONV_BACK_SYS(str)); if( data.empty() ) - return; + return false; + bool processed = false; for( wxString::const_iterator pstr = data.begin(); pstr != data.end(); ++pstr ) { #if wxUSE_UNICODE @@ -1100,9 +1107,22 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), AdjustCharEventKeyCodes(event); - window->HandleWindowEvent(event); + if ( HandleWindowEvent(event) ) + processed = true; } + + return processed; } + +bool wxWindowGTK::GTKOnInsertText(const char* text) +{ + if ( !m_imKeyEvent ) + { + // We're not inside IM key handling at all. + return false; + } + + return GTKDoInsertTextFromIM(text); } @@ -1628,6 +1648,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) // FIXME: Get these values from GTK or GDK event.m_linesPerAction = 3; + event.m_columnsPerAction = 3; event.m_wheelDelta = 120; // Determine the scroll direction. @@ -1672,13 +1693,29 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) if (win->GTKProcessEvent(event)) return TRUE; - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; + GtkRange *range; + switch (gdk_event->direction) + { + case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: + range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; + break; + + case GDK_SCROLL_LEFT: + case GDK_SCROLL_RIGHT: + range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; + break; + + default: + return false; + } 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_UP) + if (gdk_event->direction == GDK_SCROLL_UP || + gdk_event->direction == GDK_SCROLL_LEFT) delta = -delta; gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); @@ -1903,6 +1940,14 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) if (w < 0) w = 0; if (h < 0) h = 0; } + GtkAllocation a; + gtk_widget_get_allocation(win->m_widget, &a); + // update position for widgets in native containers, such as wxToolBar + 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) { @@ -1910,8 +1955,6 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) win->m_clientHeight = h; // this callback can be connected to m_wxwindow, // so always get size from m_widget->allocation - GtkAllocation a; - gtk_widget_get_allocation(win->m_widget, &a); win->m_width = a.width; win->m_height = a.height; if (!win->m_nativeSizeEvent) @@ -2062,12 +2105,14 @@ void wxWindowGTK::GTKHandleUnrealize() wxWindow *wxWindowBase::DoFindFocus() { +#if wxUSE_MENUS // For compatibility with wxMSW, pretend that showing a popup menu doesn't // change the focus and that it remains on the window showing it, even // though the real focus does change in GTK. extern wxMenu *wxCurrentPopupMenu; if ( wxCurrentPopupMenu ) return wxCurrentPopupMenu->GetInvokingWindow(); +#endif // wxUSE_MENUS wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus; // the cast is necessary when we compile in wxUniversal mode @@ -2396,9 +2441,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 ) { @@ -3348,6 +3390,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) ) @@ -4339,6 +4383,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(); @@ -4568,7 +4619,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; }