From 8253c7fda19e5f1c58326fa4fa076ca21684aade Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 23 Jan 2000 15:51:36 +0000 Subject: [PATCH] tabbing in controls sample works again. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/notebook.h | 25 +++++++--------- include/wx/gtk1/notebook.h | 25 +++++++--------- samples/controls/controls.cpp | 2 +- src/generic/listctrl.cpp | 3 +- src/generic/panelg.cpp | 18 ++++-------- src/gtk/notebook.cpp | 54 ++++++++++++++++++++++++++--------- src/gtk/window.cpp | 4 +-- src/gtk1/notebook.cpp | 54 ++++++++++++++++++++++++++--------- src/gtk1/window.cpp | 4 +-- 9 files changed, 116 insertions(+), 73 deletions(-) diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 6e8a0a1f40..45039a0bd7 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -38,26 +38,24 @@ class wxNotebookPage; class wxNotebook : public wxControl { public: - // ctors - // ----- - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, + // default for dynamic class + wxNotebook(); + // the same arguments as for wxControl + wxNotebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // Create() function - bool Create(wxWindow *parent, + // Create() function + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // dtor - ~wxNotebook(); + // dtor + ~wxNotebook(); // accessors // --------- @@ -128,10 +126,9 @@ public: // get the panel which represents the given page wxWindow *GetPage(int nPage) const; - void OnNavigationKey(wxNavigationKeyEvent& event); - - // overridden from wxWindow to make tabbing work - void SetFocus(); + // handler for tab navigation + // -------------------------- + void OnNavigationKey(wxNavigationKeyEvent& event); // implementation // -------------- diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 6e8a0a1f40..45039a0bd7 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -38,26 +38,24 @@ class wxNotebookPage; class wxNotebook : public wxControl { public: - // ctors - // ----- - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, + // default for dynamic class + wxNotebook(); + // the same arguments as for wxControl + wxNotebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // Create() function - bool Create(wxWindow *parent, + // Create() function + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // dtor - ~wxNotebook(); + // dtor + ~wxNotebook(); // accessors // --------- @@ -128,10 +126,9 @@ public: // get the panel which represents the given page wxWindow *GetPage(int nPage) const; - void OnNavigationKey(wxNavigationKeyEvent& event); - - // overridden from wxWindow to make tabbing work - void SetFocus(); + // handler for tab navigation + // -------------------------- + void OnNavigationKey(wxNavigationKeyEvent& event); // implementation // -------------- diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index b40bf86a55..d542ea70ed 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -384,7 +384,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE ); // m_text->SetBackgroundColour("wheat"); - //wxLog::AddTraceMask(_T("focus")); + wxLog::AddTraceMask(_T("focus")); m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) ); diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 77f0ebe6d7..098346f76a 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -1622,8 +1622,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) { wxNavigationKeyEvent nevent; nevent.SetDirection( !event.ShiftDown() ); + nevent.SetEventObject( GetParent()->GetParent() ); nevent.SetCurrentFocus( m_parent ); - if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return; + if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) return; } /* no item -> nothing to do */ diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index e586d96323..24fcb03ba4 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -227,14 +227,9 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event ) if ( focussed_child_of_parent->IsTopLevel() ) break; - // is the parent a panel? - wxPanel *panel = wxDynamicCast(parent, wxPanel); - if (panel) - { - event.SetCurrentFocus( focussed_child_of_parent ); - if (parent->GetEventHandler()->ProcessEvent( event )) - return; - } + event.SetCurrentFocus( focussed_child_of_parent ); + if (parent->GetEventHandler()->ProcessEvent( event )) + return; focussed_child_of_parent = parent; } @@ -318,10 +313,7 @@ void wxPanel::SetFocus() // think my addition to OnNavigationKey() above takes care of it. // Keeping #ifdef __WXGTK__ for now, but please try removing it and see // what happens. - -#ifdef __WXGTK__ - m_winLastFocused = (wxWindow *)NULL; -#endif // 0 + // RR: Removed for now. if ( !SetFocusToChild() ) { @@ -331,7 +323,7 @@ void wxPanel::SetFocus() void wxPanel::OnFocus(wxFocusEvent& event) { - wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x."), GetHandle()); + wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x, name: %s"), GetHandle(), GetName().c_str() ); // If the panel gets the focus *by way of getting clicked on* // we move the focus to either the last window that had the diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 08f824bb72..b9b68d5f59 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -153,6 +153,44 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) return FALSE; } +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) + { + wxNode *node = win->m_pages.Nth( win->GetSelection() ); + if (!node) return FALSE; + + wxNotebookPage *page = (wxNotebookPage*) node->Data(); + + wxNavigationKeyEvent event; + event.SetEventObject( win ); + /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ + event.SetDirection( (gdk_event->keyval == GDK_Tab) ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + event.SetCurrentFocus( win ); + if (!page->m_client->GetEventHandler()->ProcessEvent( event )) + { + page->m_client->SetFocus(); + } + + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } + + return FALSE; +} + //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- @@ -237,6 +275,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxNB_BOTTOM) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); + gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", + GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); + PostCreation(); SetFont( parent->GetFont() ); @@ -249,19 +290,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, return TRUE; } -void wxNotebook::SetFocus() -{ - if (m_pages.GetCount() == 0) return; - - wxNode *node = m_pages.Nth( GetSelection() ); - - if (!node) return; - - wxNotebookPage *page = (wxNotebookPage*) node->Data(); - - page->m_client->SetFocus(); -} - int wxNotebook::GetSelection() const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 1a751d4a6c..c12549013e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -778,13 +778,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) { wxNavigationKeyEvent new_event; - new_event.SetEventObject( win ); + new_event.SetEventObject( win->GetParent() ); /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); new_event.SetCurrentFocus( win ); - ret = win->GetEventHandler()->ProcessEvent( new_event ); + ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); } /* generate wxID_CANCEL if has been pressed (typically in dialogs) */ diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 08f824bb72..b9b68d5f59 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -153,6 +153,44 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) return FALSE; } +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) + { + wxNode *node = win->m_pages.Nth( win->GetSelection() ); + if (!node) return FALSE; + + wxNotebookPage *page = (wxNotebookPage*) node->Data(); + + wxNavigationKeyEvent event; + event.SetEventObject( win ); + /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ + event.SetDirection( (gdk_event->keyval == GDK_Tab) ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + event.SetCurrentFocus( win ); + if (!page->m_client->GetEventHandler()->ProcessEvent( event )) + { + page->m_client->SetFocus(); + } + + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } + + return FALSE; +} + //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- @@ -237,6 +275,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxNB_BOTTOM) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); + gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", + GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); + PostCreation(); SetFont( parent->GetFont() ); @@ -249,19 +290,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, return TRUE; } -void wxNotebook::SetFocus() -{ - if (m_pages.GetCount() == 0) return; - - wxNode *node = m_pages.Nth( GetSelection() ); - - if (!node) return; - - wxNotebookPage *page = (wxNotebookPage*) node->Data(); - - page->m_client->SetFocus(); -} - int wxNotebook::GetSelection() const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 1a751d4a6c..c12549013e 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -778,13 +778,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) { wxNavigationKeyEvent new_event; - new_event.SetEventObject( win ); + new_event.SetEventObject( win->GetParent() ); /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); new_event.SetCurrentFocus( win ); - ret = win->GetEventHandler()->ProcessEvent( new_event ); + ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); } /* generate wxID_CANCEL if has been pressed (typically in dialogs) */ -- 2.45.2