X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36202885d48e85cc2012f5595ec1dfe00991e886..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/gtk/notebook.cpp?ds=inline diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 1bbcc15109..76baec9d8e 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "notebook.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/notebook.h" #if wxUSE_NOTEBOOK @@ -20,10 +23,11 @@ #include "wx/imaglist.h" #include "wx/intl.h" #include "wx/log.h" +#include "wx/bitmap.h" -#include -#include +#include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" + #include // ---------------------------------------------------------------------------- @@ -44,31 +48,26 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; - -//----------------------------------------------------------------------------- -// debug -//----------------------------------------------------------------------------- - -#ifdef __WXDEBUG__ - -extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); - -#endif +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // wxGtkNotebookPage //----------------------------------------------------------------------------- +// VZ: this is rather ugly as we keep the pages themselves in an array (it +// allows us to have quite a few functions implemented in the base class) +// but the page data is kept in a separate list, so we must maintain them +// in sync manually... of course, the list had been there before the base +// class which explains it but it still would be nice to do something +// about this one day + class wxGtkNotebookPage: public wxObject { public: wxGtkNotebookPage() { - m_text = ""; m_image = -1; m_page = (GtkNotebookPage *) NULL; - m_client = (wxNotebookPage *) NULL; m_box = (GtkWidget *) NULL; } @@ -76,10 +75,12 @@ public: int m_image; GtkNotebookPage *m_page; GtkLabel *m_label; - wxNotebookPage *m_client; GtkWidget *m_box; // in which the label and image are packed }; +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxGtkNotebookPagesList); + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- @@ -89,14 +90,12 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), gint page, wxNotebook *notebook ) { - static bool s_inPageChange = FALSE; - // are you trying to call SetSelection() from a notebook event handler? // you shouldn't! - wxCHECK_RET( !s_inPageChange, + wxCHECK_RET( !notebook->m_inSwitchPage, _T("gtk_notebook_page_change_callback reentered") ); - s_inPageChange = TRUE; + notebook->m_inSwitchPage = TRUE; if (g_isIdle) wxapp_install_idle_handler(); @@ -126,7 +125,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), notebook->GetEventHandler()->ProcessEvent( eventChanged ); } - s_inPageChange = FALSE; + notebook->m_inSwitchPage = FALSE; } //----------------------------------------------------------------------------- @@ -192,10 +191,11 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk /* win is a control: tab can be propagated up */ if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { - wxNode *node = win->m_pages.Nth( win->GetSelection() ); - if (!node) return FALSE; - - wxGtkNotebookPage *page = (wxGtkNotebookPage*) node->Data(); + int sel = win->GetSelection(); + if (sel == -1) + return TRUE; + wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel); + wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; event.SetEventObject( win ); @@ -204,9 +204,11 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk /* 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 )) + + wxNotebookPage *client = win->GetPage(sel); + if ( !client->GetEventHandler()->ProcessEvent( event ) ) { - page->m_client->SetFocus(); + client->SetFocus(); } gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); @@ -237,9 +239,10 @@ END_EVENT_TABLE() void wxNotebook::Init() { + m_padding = 0; + m_inSwitchPage = FALSE; + m_imageList = (wxImageList *) NULL; - m_ownsImageList = FALSE; - m_pages.DeleteContents( TRUE ); m_selection = -1; m_themeEnabled = TRUE; } @@ -259,17 +262,12 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { - /* don't generate change page events any more */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); - DeleteAllPages(); - if (m_ownsImageList) delete m_imageList; } bool wxNotebook::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; @@ -285,10 +283,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_notebook_new(); -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name ); -#endif - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", @@ -324,9 +318,9 @@ int wxNotebook::GetSelection() const if ( m_selection == -1 ) { - GList *pages = GTK_NOTEBOOK(m_widget)->children; + GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; - if (g_list_length(pages) != 0) + if (g_list_length(nb_pages) != 0) { GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -334,7 +328,7 @@ int wxNotebook::GetSelection() const if ( cur != NULL ) { wxConstCast(this, wxNotebook)->m_selection = - g_list_index( pages, cur ); + g_list_index( nb_pages, cur ); } } } @@ -342,17 +336,7 @@ int wxNotebook::GetSelection() const return m_selection; } -int wxNotebook::GetPageCount() const -{ - return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children ); -} - -int wxNotebook::GetRowCount() const -{ - return 1; -} - -wxString wxNotebook::GetPageText( int page ) const +wxString wxNotebook::GetPageText( size_t page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); @@ -363,7 +347,7 @@ wxString wxNotebook::GetPageText( int page ) const return wxT(""); } -int wxNotebook::GetPageImage( int page ) const +int wxNotebook::GetPageImage( size_t page ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); @@ -378,65 +362,31 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); + wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - wxNode *node = m_pages.Nth( page ); - - return (wxGtkNotebookPage *) node->Data(); + return m_pagesData.Item(page)->GetData(); } -int wxNotebook::SetSelection( int page ) +int wxNotebook::SetSelection( size_t page ) { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") ); + wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); // cache the selection m_selection = page; 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; -} - -void wxNotebook::AdvanceSelection( bool forward ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); - - int max = GetPageCount(); - if ( !max ) - { - // nothing to do with empty notebook - return; - } - int sel = GetSelection(); - - if (forward) - SetSelection( sel == max - 1 ? 0 : sel + 1 ); - else - SetSelection( sel == 0 ? max - 1 : sel - 1 ); -} - -void wxNotebook::SetImageList( wxImageList* imageList ) -{ - if (m_ownsImageList) delete m_imageList; - m_imageList = imageList; - m_ownsImageList = FALSE; -} + wxNotebookPage *client = GetPage(page); + if ( client ) + client->SetFocus(); -void wxNotebook::AssignImageList( wxImageList* imageList ) -{ - SetImageList(imageList); - m_ownsImageList = TRUE; + return selOld; } -bool wxNotebook::SetPageText( int page, const wxString &text ) +bool wxNotebook::SetPageText( size_t page, const wxString &text ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); @@ -446,12 +396,12 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) nb_page->m_text = text; - gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() ); + gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); return TRUE; } -bool wxNotebook::SetPageImage( int page, int image ) +bool wxNotebook::SetPageImage( size_t page, int image ) { /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ @@ -522,7 +472,7 @@ bool wxNotebook::SetPageImage( int page, int image ) 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_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } else @@ -541,9 +491,31 @@ void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } -void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) +void wxNotebook::SetPadding( const wxSize &padding ) { - wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); + + m_padding = padding.GetWidth(); + + int i; + for (i=0; im_image != -1) + { + // gtk_box_set_child_packing sets padding on BOTH sides + // icon provides left padding, label provides center and right + int image = nb_page->m_image; + SetPageImage(i,-1); + SetPageImage(i,image); + } + wxASSERT(nb_page->m_label); + gtk_box_set_child_packing(GTK_BOX(nb_page->m_box), + GTK_WIDGET(nb_page->m_label), + FALSE, FALSE, m_padding, GTK_PACK_END); + } } void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) @@ -555,60 +527,68 @@ bool wxNotebook::DeleteAllPages() { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - while (m_pages.GetCount() > 0) - DeletePage( m_pages.GetCount()-1 ); + while (m_pagesData.GetCount() > 0) + DeletePage( m_pagesData.GetCount()-1 ); - return TRUE; + wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + + return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( int page ) +bool wxNotebook::DeletePage( size_t page ) { - wxGtkNotebookPage* nb_page = GetNotebookPage(page); - wxCHECK_MSG( nb_page, FALSE, _T("invalid page in wxNotebook::DeletePage") ); - - // GTK sets GtkNotebook.cur_page to NULL before sending the switch page - // event so we have to store the selection internally - if ( m_selection == -1 ) + if ( m_selection == (int)m_pagesData.GetCount() - 1 ) { - m_selection = GetSelection(); - if ( m_selection == (int)m_pages.GetCount() - 1 ) - { - // the index will become invalid after the page is deleted - m_selection = -1; - } + // the index will become invalid after the page is deleted + m_selection = -1; } - nb_page->m_client->Destroy(); - m_pages.DeleteObject( nb_page ); - - return TRUE; + // it will call our DoRemovePage() to do the real work + return wxNotebookBase::DeletePage(page); } -bool wxNotebook::RemovePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - wxGtkNotebookPage* nb_page = GetNotebookPage(page); + wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); + if ( !client ) + return NULL; + + gtk_widget_ref( client->m_widget ); + gtk_widget_unrealize( client->m_widget ); + gtk_widget_unparent( client->m_widget ); - wxCHECK_MSG( nb_page, FALSE, _T("wxNotebook::RemovePage: invalid page") ); + // gtk_notebook_remove_page() sends "switch_page" signal with some strange + // new page index (when deleting selected page 0, new page is 1 although, + // clearly, the selection should stay 0), so suppress this + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); - gtk_widget_ref( nb_page->m_client->m_widget ); - gtk_widget_unrealize( nb_page->m_client->m_widget ); - gtk_widget_unparent( nb_page->m_client->m_widget ); - gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); - m_pages.DeleteObject( nb_page ); + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + + wxGtkNotebookPage* p = GetNotebookPage(page); + m_pagesData.DeleteObject(p); + delete p; - return TRUE; + return client; } -bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text, - bool select, int imageId ) +bool wxNotebook::InsertPage( size_t position, + wxNotebookPage* win, + const wxString& text, + bool select, + int imageId ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); wxCHECK_MSG( win->GetParent() == this, FALSE, wxT("Can't add a page whose parent is not the notebook!") ); + wxCHECK_MSG( position <= GetPageCount(), FALSE, + _T("invalid page index in wxNotebookPage::InsertPage()") ); + /* don't receive switch page during addition */ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); @@ -618,30 +598,33 @@ bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxGtkNotebookPage *page = new wxGtkNotebookPage(); + wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); - if (position < 0) - m_pages.Append( page ); + if ( position == GetPageCount() ) + m_pagesData.Append( nb_page ); else - m_pages.Insert( m_pages.Nth( position ), page ); + m_pagesData.Insert( m_pagesData.Item( position ), nb_page ); - page->m_client = win; + m_pages.Insert(win, position); - page->m_box = gtk_hbox_new( FALSE, 0 ); - gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 ); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); + gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); - if (position < 0) - gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); +#ifndef __VMS + // On VMS position is unsigned and thus always positive + if (position < 0) + gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box ); else - gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position ); +#endif + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); - page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; + nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; /* set the label image */ - page->m_image = imageId; + nb_page->m_image = imageId; if (imageId != -1) { @@ -657,27 +640,29 @@ bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } /* set the label text */ - page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = wxT(""); - - page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) ); - gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 ); - + nb_page->m_text = text; + if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); + + nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); + gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); + /* show the label */ - gtk_widget_show( GTK_WIDGET(page->m_label) ); - - if (select && (m_pages.GetCount() > 1)) + gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); + if (select && (m_pagesData.GetCount() > 1)) { +#ifndef __VMS + // On VMS position is unsigned and thus always positive if (position < 0) SetSelection( GetPageCount()-1 ); else - SetSelection( position ); +#endif + SetSelection( position ); } gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", @@ -686,12 +671,6 @@ bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& return TRUE; } -bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text, - bool select, int imageId) -{ - return InsertPage( -1, win, text, select, imageId ); -} - void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { if (event.IsWindowChange()) @@ -700,17 +679,6 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.Skip(); } -wxNotebookPage *wxNotebook::GetPage( int page ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") ); - - wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return (wxNotebookPage *) NULL; - else - return nb_page->m_client; -} - #if wxUSE_CONSTRAINTS // override these 2 functions to do nothing: everything is done in OnSize @@ -738,7 +706,7 @@ void wxNotebook::ApplyWidgetStyle() bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) { return ((m_widget->window == window) || - (GTK_NOTEBOOK(m_widget)->panel == window)); + (NOTEBOOK_PANEL(m_widget) == window)); } //-----------------------------------------------------------------------------