X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..61ef57fc5ec21c6561ec4a1f6b68bcc8e7a01b29:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index db83d59ac4..5afa688185 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -127,6 +127,10 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNo
     if (g_blockEventsOnDrag) return FALSE;
 
     if (!notebook->HasVMT()) return FALSE;
+    
+    /* this code makes jumping down from the handles of the notebooks
+       to the actual items in the visible notebook page possible with
+       the down-arrow key */
 
     if (gdk_event->keyval != GDK_Down) return FALSE;
     
@@ -173,7 +177,7 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
 
-    wxASSERT_MSG( page->m_page, "Notebook page creation error" );
+    wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );
 
     parent->m_pages.Append( page );
 }
@@ -184,6 +188,10 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+END_EVENT_TABLE()
+    
 void wxNotebook::Init()
 {
     m_imageList = (wxImageList *) NULL;
@@ -225,10 +233,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_notebook_new();
 
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, "wxNotebook::m_widget", name );
-#endif
-
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     m_idHandler = gtk_signal_connect (
@@ -252,7 +256,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 int wxNotebook::GetSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
 
     if (m_pages.Number() == 0) return -1;
 
@@ -277,7 +281,7 @@ int wxNotebook::GetSelection() const
         node = node->Next();
     }
 
-    wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
+    wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") );
 
     return page->m_id;
 }
@@ -306,7 +310,7 @@ int wxNotebook::GetRowCount() const
 
 wxString wxNotebook::GetPageText( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") );
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
@@ -317,7 +321,7 @@ wxString wxNotebook::GetPageText( int page ) const
 
 int wxNotebook::GetPageImage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") );
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
@@ -328,7 +332,7 @@ int wxNotebook::GetPageImage( int page ) const
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") );
 
     wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 
@@ -341,14 +345,14 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
         node = node->Next();
     }
 
-    wxFAIL_MSG( "Notebook page not found!" );
+    wxFAIL_MSG( _T("Notebook page not found!") );
 
     return (wxNotebookPage *) NULL;
 }
 
 int wxNotebook::SetSelection( int page )
 {
-    wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
 
     int selOld = GetSelection();
     wxNotebookPage* nb_page = GetNotebookPage(page);
@@ -373,7 +377,7 @@ int wxNotebook::SetSelection( int page )
 
 void wxNotebook::AdvanceSelection( bool bForward )
 {
-    wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid notebook") );
 
     int sel = GetSelection();
     int max = GetPageCount();
@@ -381,7 +385,7 @@ void wxNotebook::AdvanceSelection( bool bForward )
     if (bForward)
         SetSelection( sel == max ? 0 : sel + 1 );
     else
-        SetSelection( sel == 0 ? max : sel - 1 );
+        SetSelection( sel == 0 ? max-1 : sel - 1 );
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
@@ -391,7 +395,7 @@ void wxNotebook::SetImageList( wxImageList* imageList )
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
 
@@ -399,9 +403,9 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 
     nb_page->m_text = text;
 
-    if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = _T("");
  
-    gtk_label_set(nb_page->m_label, nb_page->m_text);
+    gtk_label_set(nb_page->m_label, nb_page->m_text.mbc_str());
    
     return TRUE;
 }
@@ -429,7 +433,7 @@ bool wxNotebook::SetPageImage( int page, int image )
     if (image == -1 && nb_page->m_image == -1)
         return TRUE; /* Case 1): Nothing to do. */
  
-    GtkWidget *pixmapwid = NULL;
+    GtkWidget *pixmapwid = (GtkWidget*) NULL;
  
     if (nb_page->m_image != -1) 
     {
@@ -493,17 +497,22 @@ bool wxNotebook::SetPageImage( int page, int image )
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
-    wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") );
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-    wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") );
+}
+
+void wxNotebook::SetTabSize(const wxSize& sz)
+{
+    wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") );
 }
 
 bool wxNotebook::DeleteAllPages()
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
 
     wxNode *page_node = m_pages.First();
     while (page_node)
@@ -532,7 +541,7 @@ bool wxNotebook::DeletePage( int page )
         child = child->next;
     }
 
-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
 
     delete nb_page->m_client;
 
@@ -555,7 +564,7 @@ bool wxNotebook::RemovePage( int page )
         child = child->next;
     }
 
-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 
@@ -567,7 +576,7 @@ bool wxNotebook::RemovePage( int page )
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool select, int imageId)
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
 
     /* we've created the notebook page in AddChild(). Now we just have to set
        the caption for the page and set the others parameters. */
@@ -583,10 +592,10 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
     }
 
     wxCHECK_MSG( page != NULL, FALSE,
-               "Can't add a page whose parent is not the notebook!" );
+               _T("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( page->Add(), FALSE,
-               "Can't add the same page twice to a notebook." );
+               _T("Can't add the same page twice to a notebook.") );
 
     if (imageId != -1)
     {
@@ -609,9 +618,9 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 
     /* then set the attributes */
     page->m_text = text;
-    if (page->m_text.IsEmpty()) page->m_text = "";
+    if (page->m_text.IsEmpty()) page->m_text = _T("");
     page->m_image = imageId;
-    page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
+    page->m_label = (GtkLabel *)gtk_label_new(page->m_text.mbc_str());
     gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
 
     /* @@@: what does this do? do we still need it?
@@ -624,9 +633,17 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
     return TRUE;
 }
 
+void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
+{
+    if (event.IsWindowChange()) 
+        AdvanceSelection( event.GetDirection() );
+    else 
+        event.Skip();
+}
+
 wxWindow *wxNotebook::GetPage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") );
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (!nb_page)