Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 8d8cc9a63995eac142357c81c5e4d815f0f9ec6b..4fbff0c3df3e362f472a32dd274853fc4edd1dca 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -50,18 +50,18 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 #endif
 
 //-----------------------------------------------------------------------------
-// wxNotebookPage
+// wxGtkNotebookPage
 //-----------------------------------------------------------------------------
 
-class wxNotebookPage: public wxObject
+class wxGtkNotebookPage: public wxObject
 {
 public:
-  wxNotebookPage()
+  wxGtkNotebookPage()
   {
     m_text = "";
     m_image = -1;
     m_page = (GtkNotebookPage *) NULL;
-    m_client = (wxWindow *) NULL;
+    m_client = (wxNotebookPage *) NULL;
     m_box = (GtkWidget *) NULL;
   }
 
@@ -69,7 +69,7 @@ public:
   int                m_image;
   GtkNotebookPage   *m_page;
   GtkLabel          *m_label;
-  wxWindow          *m_client;
+  wxNotebookPage    *m_client;
   GtkWidget         *m_box;     // in which the label and image are packed
 };
 
@@ -171,13 +171,14 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
         wxNode *node = win->m_pages.Nth( win->GetSelection() );
         if (!node) return FALSE;
 
-        wxNotebookPage *page = (wxNotebookPage*) node->Data();
+        wxGtkNotebookPage *page = (wxGtkNotebookPage*) 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.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
         event.SetCurrentFocus( win );
         if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
         {
@@ -319,7 +320,7 @@ wxString wxNotebook::GetPageText( int page ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_text;
     else
@@ -330,22 +331,22 @@ int wxNotebook::GetPageImage( int page ) const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_image;
     else
         return -1;
 }
 
-wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
 
-    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
+    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
 
     wxNode *node = m_pages.Nth( page );
 
-    return (wxNotebookPage *) node->Data();
+    return (wxGtkNotebookPage *) node->Data();
 }
 
 int wxNotebook::SetSelection( int page )
@@ -357,6 +358,10 @@ int wxNotebook::SetSelection( int page )
     int selOld = GetSelection();
 
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
+    
+    wxGtkNotebookPage* g_page = GetNotebookPage( page );
+    if (g_page->m_client) 
+        g_page->m_client->SetFocus();
 
     return selOld;
 }
@@ -389,7 +394,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
 
@@ -404,7 +409,7 @@ bool wxNotebook::SetPageImage( int page, int image )
 {
     /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
 
@@ -512,7 +517,7 @@ bool wxNotebook::DeleteAllPages()
 
 bool wxNotebook::DeletePage( int page )
 {
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (!nb_page) return FALSE;
 
     /* GTK sets GtkNotebook.cur_page to NULL before sending
@@ -529,7 +534,7 @@ bool wxNotebook::DeletePage( int page )
 
 bool wxNotebook::RemovePage( int page )
 {
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
 
@@ -540,7 +545,7 @@ bool wxNotebook::RemovePage( int page )
     return TRUE;
 }
 
-bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
+bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text,
                              bool select, int imageId )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
@@ -554,7 +559,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-    wxNotebookPage *page = new wxNotebookPage();
+    wxGtkNotebookPage *page = new wxGtkNotebookPage();
 
     if (position < 0)
         m_pages.Append( page );
@@ -622,7 +627,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
     return TRUE;
 }
 
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text,
                          bool select, int imageId)
 {
     return InsertPage( -1, win, text, select, imageId );
@@ -636,17 +641,19 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         event.Skip();
 }
 
-wxWindow *wxNotebook::GetPage( int page ) const
+wxNotebookPage *wxNotebook::GetPage( int page ) const
 {
     wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (!nb_page)
-        return (wxWindow *) NULL;
+        return (wxNotebookPage *) NULL;
     else
         return nb_page->m_client;
 }
 
+#if wxUSE_CONSTRAINTS
+
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
@@ -659,6 +666,8 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
     return TRUE;
 }
 
+#endif
+
 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc