X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3eb78d7ebb6f0dcf9222c379189068266d93c463..4ca9b362cd539ab0c3d38a027e889d3b48168578:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index ca46259e27..364487fafc 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -17,6 +17,10 @@ #include "wx/imaglist.h" #include "wx/intl.h" #include "wx/log.h" + +#include "gdk/gdk.h" +#include "gtk/gtk.h" +#include "wx/gtk/win_gtk.h" #include "gdk/gdkkeysyms.h" //----------------------------------------------------------------------------- @@ -47,8 +51,8 @@ public: /* mark page as "added' to the notebook, return FALSE if the page was already added - */ - + */ + bool Add() { if ( WasAdded() ) @@ -109,7 +113,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* } win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - + if (win->GetAutoLayout()) win->Layout(); } @@ -117,30 +121,34 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* // "key_press_event" //----------------------------------------------------------------------------- -static gint +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) { 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; - + if (notebook != notebook->FindFocus()) return FALSE; - + if (notebook->m_pages.GetCount() == 0) return FALSE; - + wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() ); - + if (!node) return FALSE; - + wxNotebookPage *page = (wxNotebookPage*) node->Data(); - + // don't let others the key event gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); - + page->m_client->SetFocus(); - + return TRUE; } @@ -169,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 ); } @@ -180,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; @@ -221,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 ( @@ -248,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; @@ -273,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; } @@ -283,12 +291,12 @@ int wxNotebook::GetPageCount() const // count only the pages which were already added to the notebook for MSW // compatibility (and, in fact, this behaviour makes more sense anyhow // because only the added pages are shown) - + int n = 0; for ( wxNode *node = m_pages.First(); node; node = node->Next() ) { wxNotebookPage *page = (wxNotebookPage*)node->Data(); - + if (page->WasAdded()) n++; } @@ -302,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) @@ -313,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) @@ -324,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; @@ -337,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); @@ -369,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(); @@ -377,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 ) @@ -387,17 +395,15 @@ 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); - if (!nb_page) return FALSE; + wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") ); nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = ""; - - 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; } @@ -405,47 +411,47 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) 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); if (!nb_page) return FALSE; - + /* Optimization posibility: return immediately if image unchanged. * Not enabled because it may break existing (stupid) code that * manipulates the imagelist to cycle images */ - + /* if (image == nb_page->m_image) return TRUE; */ - - /* For different cases: + + /* For different cases: 1) no image -> no image 2) image -> no image 3) no image -> image 4) image -> image */ - + if (image == -1 && nb_page->m_image == -1) return TRUE; /* Case 1): Nothing to do. */ - - GtkWidget *pixmapwid = NULL; - - if (nb_page->m_image != -1) + + GtkWidget *pixmapwid = (GtkWidget*) NULL; + + if (nb_page->m_image != -1) { /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */ - + GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box)); while (child) { - if (GTK_IS_PIXMAP(child->data)) + if (GTK_IS_PIXMAP(child->data)) { pixmapwid = GTK_WIDGET(child->data); break; } child = child->next; } - + /* We should have the pixmap widget now */ - wxASSERT(pixmapwid != NULL); - - if (image == -1) + wxASSERT(pixmapwid != NULL); + + if (image == -1) { /* If there's no new widget, just remove the old from the box */ gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid); @@ -454,34 +460,34 @@ bool wxNotebook::SetPageImage( int page, int image ) return TRUE; /* Case 2) */ } } - + /* Only cases 3) and 4) left */ wxASSERT( m_imageList != NULL ); /* Just in case */ - + /* Construct the new pixmap */ const wxBitmap *bmp = m_imageList->GetBitmap(image); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + if ( bmp->GetMask() ) { mask = bmp->GetMask()->GetBitmap(); } - - if (pixmapwid == NULL) + + if (pixmapwid == NULL) { /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */ pixmapwid = gtk_pixmap_new (pixmap, mask ); - + /* CHECKME: Are these pack flags okay? */ gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3); gtk_widget_show(pixmapwid); } - else + else { /* Case 4) Simply replace the pixmap */ gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); } - + nb_page->m_image = image; return TRUE; @@ -489,17 +495,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) @@ -528,7 +539,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; @@ -551,7 +562,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 ); @@ -563,7 +574,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. */ @@ -579,10 +590,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) { @@ -605,9 +616,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? @@ -620,9 +631,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)