X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..3a309a64d74bd04d9be4799f28c34b69d06a06d8:/src/gtk1/notebook.cpp?ds=inline diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index b74e19d4de..5afa688185 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" //----------------------------------------------------------------------------- @@ -44,8 +48,11 @@ public: m_added = FALSE; } - // mark page as "added' to the notebook, return FALSE if the page was - // already added + /* + mark page as "added' to the notebook, return FALSE if the page was + already added + */ + bool Add() { if ( WasAdded() ) @@ -120,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; @@ -166,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 ); } @@ -177,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; @@ -218,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 ( @@ -245,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; @@ -270,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; } @@ -299,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) @@ -310,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) @@ -321,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; @@ -334,214 +345,305 @@ 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); + int selOld = GetSelection(); + wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return -1; + if (!nb_page) return -1; - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) - { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; - } + int page_num = 0; + GList *child = GTK_NOTEBOOK(m_widget)->children; + while (child) + { + if (nb_page->m_page == (GtkNotebookPage*)child->data) break; + page_num++; + child = child->next; + } - if (!child) return -1; + if (!child) return -1; - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); + gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); - return selOld; + return selOld; } 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(); + int sel = GetSelection(); + int max = GetPageCount(); - if (bForward) - SetSelection( sel == max ? 0 : sel + 1 ); - else - SetSelection( sel == 0 ? max : sel - 1 ); + if (bForward) + SetSelection( sel == max ? 0 : sel + 1 ); + else + SetSelection( sel == 0 ? max-1 : sel - 1 ); } void wxNotebook::SetImageList( wxImageList* imageList ) { - m_imageList = imageList; + m_imageList = 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); + wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + if (!nb_page) return FALSE; - nb_page->m_text = text; + nb_page->m_text = text; - return TRUE; + if (nb_page->m_text.IsEmpty()) nb_page->m_text = _T(""); + + gtk_label_set(nb_page->m_label, nb_page->m_text.mbc_str()); + + return TRUE; } bool wxNotebook::SetPageImage( int page, int image ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + /* 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; + 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: + 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 = (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)) + { + pixmapwid = GTK_WIDGET(child->data); + break; + } + child = child->next; + } + + /* We should have the pixmap widget now */ + 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); + nb_page->m_image = -1; - nb_page->m_image = 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() ) + { + mask = bmp->GetMask()->GetBitmap(); + } + + 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 + { + /* Case 4) Simply replace the pixmap */ + gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); + } + + nb_page->m_image = image; - return TRUE; + return TRUE; } 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) - { - wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); + wxNode *page_node = m_pages.First(); + while (page_node) + { + wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); - DeletePage( page->m_id ); + DeletePage( page->m_id ); - page_node = m_pages.First(); - } + page_node = m_pages.First(); + } - return TRUE; + return TRUE; } bool wxNotebook::DeletePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxNotebookPage* nb_page = GetNotebookPage(page); + if (!nb_page) return FALSE; - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) - { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; - } + int page_num = 0; + GList *child = GTK_NOTEBOOK(m_widget)->children; + while (child) + { + if (nb_page->m_page == (GtkNotebookPage*)child->data) break; + page_num++; + 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; + delete nb_page->m_client; - m_pages.DeleteObject( nb_page ); + m_pages.DeleteObject( nb_page ); - return TRUE; + return TRUE; } bool wxNotebook::RemovePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxNotebookPage* nb_page = GetNotebookPage(page); + if (!nb_page) return FALSE; - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) - { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; - } + int page_num = 0; + GList *child = GTK_NOTEBOOK(m_widget)->children; + while (child) + { + if (nb_page->m_page == (GtkNotebookPage*)child->data) break; + page_num++; + 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 ); + gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); - m_pages.DeleteObject( nb_page ); + m_pages.DeleteObject( nb_page ); - return TRUE; + return TRUE; } bool wxNotebook::AddPage(wxWindow* win, const wxString& text, bool select, int imageId) { - wxCHECK_MSG( m_widget != NULL, FALSE, "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. + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); - wxNotebookPage *page = (wxNotebookPage *) NULL; + /* we've created the notebook page in AddChild(). Now we just have to set + the caption for the page and set the others parameters. */ - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if ( page->m_client == win ) break; - node = node->Next(); - } + wxNotebookPage *page = (wxNotebookPage *) NULL; - wxCHECK_MSG( page != NULL, FALSE, - "Can't add a page whose parent is not the notebook!" ); + wxNode *node = m_pages.First(); + while (node) + { + page = (wxNotebookPage*)node->Data(); + if ( page->m_client == win ) break; + node = node->Next(); + } - wxCHECK_MSG( page->Add(), FALSE, - "Can't add the same page twice to a notebook." ); + wxCHECK_MSG( page != NULL, FALSE, + _T("Can't add a page whose parent is not the notebook!") ); - if (imageId != -1) - { - wxASSERT( m_imageList != NULL ); + wxCHECK_MSG( page->Add(), FALSE, + _T("Can't add the same page twice to a notebook.") ); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); - GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + if (imageId != -1) { - mask = bmp->GetMask()->GetBitmap(); - } + wxASSERT( m_imageList != NULL ); - GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); + const wxBitmap *bmp = m_imageList->GetBitmap(imageId); + GdkPixmap *pixmap = bmp->GetPixmap(); + GdkBitmap *mask = (GdkBitmap*) NULL; + if ( bmp->GetMask() ) + { + mask = bmp->GetMask()->GetBitmap(); + } - gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - gtk_widget_show(pixmapwid); - } + gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + + gtk_widget_show(pixmapwid); + } - // then set the attributes - page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = ""; - page->m_image = imageId; - page->m_label = (GtkLabel *)gtk_label_new(page->m_text); - gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3); + /* then set the attributes */ + page->m_text = text; + if (page->m_text.IsEmpty()) page->m_text = _T(""); + page->m_image = imageId; + 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? - // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); + /* @@@: what does this do? do we still need it? + gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */ - gtk_widget_show((GtkWidget *)page->m_label); + gtk_widget_show((GtkWidget *)page->m_label); - if (select) SetSelection( GetPageCount()-1 ); + if (select) SetSelection( GetPageCount()-1 ); - return TRUE; + 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)