X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04f90a8ce6bbe5120daa898b76f4358127e7c761..062c4861718a681a27384d6a2313fc26cda3b3e4:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 8bf4d36bfa..cc9855afae 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -42,9 +42,12 @@ #include "gtk/gtk.h" #include "gdk/gdkprivate.h" #include "gdk/gdkkeysyms.h" -#include "gdk/gdkx.h" #include "wx/gtk/win_gtk.h" +#if (GTK_MINOR_VERSION == 0) +#include "gdk/gdkx.h" +#endif + //----------------------------------------------------------------------------- // documentation on internals //----------------------------------------------------------------------------- @@ -186,6 +189,22 @@ extern bool g_isIdle; // key event conversion routines //----------------------------------------------------------------------------- +#if (GTK_MINOR_VERSION == 0) +static guint +gdk_keyval_to_upper (guint keyval) +{ + if (keyval) + { + KeySym lower_val = 0; + KeySym upper_val = 0; + + XConvertCase (keyval, &lower_val, &upper_val); + return upper_val; + } + return 0; +} +#endif + static long map_to_unmodified_wx_keysym( KeySym keysym ) { guint key_code = 0; @@ -249,7 +268,7 @@ static long map_to_unmodified_wx_keysym( KeySym keysym ) case GDK_KP_Down: key_code = WXK_NUMPAD_DOWN; break; case GDK_KP_Prior: key_code = WXK_NUMPAD_PRIOR; break; // case GDK_KP_Page_Up: key_code = WXK_NUMPAD_PAGEUP; break; - case GDK_KP_Next: key_code = WXK_NUMPAD_PRIOR; break; + case GDK_KP_Next: key_code = WXK_NUMPAD_NEXT; break; // case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break; case GDK_KP_End: key_code = WXK_NUMPAD_END; break; case GDK_KP_Begin: key_code = WXK_NUMPAD_BEGIN; break; @@ -348,7 +367,7 @@ static long map_to_wx_keysym( KeySym keysym ) case GDK_KP_Down: key_code = WXK_DOWN; break; case GDK_KP_Prior: key_code = WXK_PRIOR; break; // case GDK_KP_Page_Up: key_code = WXK_PAGEUP; break; - case GDK_KP_Next: key_code = WXK_PRIOR; break; + case GDK_KP_Next: key_code = WXK_NEXT; break; // case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break; case GDK_KP_End: key_code = WXK_END; break; case GDK_KP_Begin: key_code = WXK_HOME; break; @@ -386,14 +405,6 @@ static long map_to_wx_keysym( KeySym keysym ) return (key_code); } -static long get_unmodified_wx_keysym( GdkEventKey *event ) -{ - KeyCode keycode = XKeysymToKeycode( GDK_DISPLAY(), event->keyval ); - KeySym keysym = XKeycodeToKeysym( GDK_DISPLAY(), keycode, 0 ); - - return (map_to_unmodified_wx_keysym( keysym )); -} - //----------------------------------------------------------------------------- // local code (see below) //----------------------------------------------------------------------------- @@ -429,7 +440,7 @@ static void draw_frame( GtkWidget *widget, wxWindow *win ) if (scroll_window->hscrollbar_visible) { dh += 15; /* dh += hscrollbar->allocation.height; */ - dw += scroll_class->scrollbar_spacing; + dh += scroll_class->scrollbar_spacing; } } @@ -562,15 +573,17 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e printf( "ControlUp.\n" ); printf( "\n" ); */ - - bool ret = FALSE; - int x = 0; int y = 0; GdkModifierType state; if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state); - long key_code = get_unmodified_wx_keysym( gdk_event ); + long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); + + /* sending unknown key events doesn't really make sense */ + if (key_code == 0) return FALSE; + + bool ret = FALSE; wxKeyEvent event( wxEVT_KEY_DOWN ); event.SetTimestamp( gdk_event->time ); @@ -636,6 +649,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e ret = win->GetEventHandler()->ProcessEvent( new_event ); } + /* generate wxID_CANCEL if has been pressed (typically in dialogs) */ if ( (!ret) && (gdk_event->keyval == GDK_Escape) ) { @@ -643,6 +657,36 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e new_event.SetEventObject( win ); ret = win->GetEventHandler()->ProcessEvent( new_event ); } + +#if (GTK_MINOR_VERSION > 0) + /* pressing F10 will activate the menu bar of the top frame */ + if ( (!ret) && + (gdk_event->keyval == GDK_F10) ) + { + wxWindow *ancestor = win; + while (ancestor) + { + if (wxIsKindOf(ancestor,wxFrame)) + { + wxFrame *frame = (wxFrame*) ancestor; + wxMenuBar *menubar = frame->GetMenuBar(); + if (menubar) + { + wxNode *node = menubar->GetMenus().First(); + if (node) + { + wxMenu *firstMenu = (wxMenu*) node->Data(); + // doesn't work correctly + // gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) ); + // ret = TRUE; + break; + } + } + } + ancestor = ancestor->GetParent(); + } + } +#endif /* Damn, I forgot why this didn't work, but it didn't work. @@ -701,7 +745,10 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk printf( "\n" ); */ - long key_code = get_unmodified_wx_keysym( gdk_event ); + long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); + + /* sending unknown key events doesn't really make sense */ + if (key_code == 0) return FALSE; int x = 0; int y = 0; @@ -1207,7 +1254,9 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_ gdk_window_set_cursor( widget->window, win->GetCursor().GetCursor() ); wxMouseEvent event( wxEVT_ENTER_WINDOW ); +#if (GTK_MINOR_VERSION > 0) event.SetTimestamp( gdk_event->time ); +#endif event.SetEventObject( win ); int x = 0; @@ -1254,7 +1303,9 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() ); wxMouseEvent event( wxEVT_LEAVE_WINDOW ); +#if (GTK_MINOR_VERSION > 0) event.SetTimestamp( gdk_event->time ); +#endif event.SetEventObject( win ); int x = 0; @@ -1490,6 +1541,10 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) win->SetForegroundColour( win->GetForegroundColour() ); win->SetCursor( win->GetCursor() ); + + wxWindowCreateEvent event( win ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); return FALSE; } @@ -1931,7 +1986,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) int border = 0; - if (GTK_WIDGET_HAS_DEFAULT(m_widget)) + if (GTK_WIDGET_CAN_DEFAULT(m_widget)) { /* the default button has a border around it */ border = 5; @@ -2043,7 +2098,7 @@ void wxWindow::DoSetClientSize( int width, int height ) if (scroll_window->hscrollbar_visible) { dh += 15; /* dh += hscrollbar->allocation.height; */ - dw += scroll_class->scrollbar_spacing; + dh += scroll_class->scrollbar_spacing; } } @@ -2123,7 +2178,7 @@ void wxWindow::DoGetPosition( int *x, int *y ) const if (y) (*y) = m_y; } -void wxWindow::ClientToScreen( int *x, int *y ) const +void wxWindow::DoClientToScreen( int *x, int *y ) const { wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); @@ -2152,7 +2207,7 @@ void wxWindow::ClientToScreen( int *x, int *y ) const if (y) *y += org_y; } -void wxWindow::ScreenToClient( int *x, int *y ) const +void wxWindow::DoScreenToClient( int *x, int *y ) const { wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); @@ -2860,6 +2915,14 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) m_scrollGC = gdk_gc_new( m_wxwindow->window ); gdk_gc_set_exposures( m_scrollGC, TRUE ); } + + wxNode *node = m_children.First(); + while (node) + { + wxWindow *child = (wxWindow*) node->Data(); + child->Move( child->m_x + dx, child->m_y + dy ); + node = node->Next(); + } int cw = 0; int ch = 0; @@ -2893,14 +2956,6 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) Refresh( TRUE, &rect ); } - - wxNode *node = m_children.First(); - while (node) - { - wxWindow *child = (wxWindow*) node->Data(); - child->Move( child->m_x + dx, child->m_y + dy ); - node = node->Next(); - } } void wxWindow::SetScrolling(bool scroll)