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 2d4ed460a5dbbd6bb526cdf38e0d820e90681aa8..4fbff0c3df3e362f472a32dd274853fc4edd1dca 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -178,6 +178,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
         /* 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 */
         /* 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 ))
         {
         event.SetCurrentFocus( win );
         if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
         {


@@ -357,6 +358,10 @@ int wxNotebook::SetSelection( int page )
     int selOld = GetSelection();
 
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), 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;
 }
 
     return selOld;
 }


@@ -647,6 +652,8 @@ wxNotebookPage *wxNotebook::GetPage( int page ) const
         return nb_page->m_client;
 }
 
         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) )
 {
 // 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;
 }
 
     return TRUE;
 }
 

+#endif
+

 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc
 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc