X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..e52d9c784ed95b099017cca9301b325085c7f4d1:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index e291346283..fe5e541720 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -21,9 +21,9 @@ #include "wx/intl.h" #include "wx/log.h" -#include -#include +#include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" + #include // ---------------------------------------------------------------------------- @@ -44,31 +44,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 +71,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" //----------------------------------------------------------------------------- @@ -192,10 +189,9 @@ 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(); + wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel); + wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; event.SetEventObject( win ); @@ -204,9 +200,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 +235,9 @@ END_EVENT_TABLE() void wxNotebook::Init() { + m_padding = 0; m_imageList = (wxImageList *) NULL; - m_ownsImageList = FALSE; - m_pages.DeleteContents( TRUE ); + m_pagesData.DeleteContents( TRUE ); m_selection = -1; m_themeEnabled = TRUE; } @@ -264,12 +262,11 @@ wxNotebook::~wxNotebook() 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 +282,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 +317,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 +327,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,16 +335,6 @@ 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 { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); @@ -378,43 +361,28 @@ 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") ); - - wxNode *node = m_pages.Nth( page ); + wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - return (wxGtkNotebookPage *) node->Data(); + return m_pagesData.Item(page)->GetData(); } int wxNotebook::SetSelection( int 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 < (int)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; -} + wxNotebookPage *client = GetPage(page); + if ( client ) + client->SetFocus(); -void wxNotebook::SetImageList( wxImageList* imageList ) -{ - if (m_ownsImageList) delete m_imageList; - m_imageList = imageList; - m_ownsImageList = FALSE; -} - -void wxNotebook::AssignImageList( wxImageList* imageList ) -{ - SetImageList(imageList); - m_ownsImageList = TRUE; + return selOld; } bool wxNotebook::SetPageText( int page, const wxString &text ) @@ -427,7 +395,7 @@ 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; } @@ -503,7 +471,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 @@ -522,9 +490,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)) @@ -536,61 +526,63 @@ 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 ) { - 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 ) { m_selection = GetSelection(); - if ( m_selection == (int)m_pages.GetCount() - 1 ) + if ( m_selection == (int)m_pagesData.GetCount() - 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); } wxNotebookPage *wxNotebook::DoRemovePage( int page ) { - wxGtkNotebookPage* nb_page = GetNotebookPage(page); + wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); + if ( !client ) + return NULL; - wxCHECK_MSG( nb_page, NULL, _T("wxNotebook::RemovePage: invalid page") ); + gtk_widget_ref( client->m_widget ); + gtk_widget_unrealize( client->m_widget ); + gtk_widget_unparent( client->m_widget ); - 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 ); - wxNotebookPage *pageRemoved = (wxNotebookPage *)m_pages[page]; - m_pages.DeleteObject( nb_page ); + m_pagesData.DeleteObject(GetNotebookPage(page)); - return pageRemoved; + return client; } -bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text, - bool select, int imageId ) +bool wxNotebook::InsertPage( int 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 >= 0 && 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 ); @@ -600,30 +592,30 @@ 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 ); + 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 ); + 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) { @@ -639,22 +631,21 @@ 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(nb_page->m_text.mbc_str()) ); + 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)) { if (position < 0) SetSelection( GetPageCount()-1 ); @@ -668,12 +659,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()) @@ -709,7 +694,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)); } //-----------------------------------------------------------------------------