X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b07d7130880c63b7f7908606a10f885e2719efc..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index eb13d01f46..f47bb99b30 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -12,16 +12,33 @@ #endif #include "wx/notebook.h" + +#if wxUSE_NOTEBOOK + #include "wx/panel.h" #include "wx/utils.h" #include "wx/imaglist.h" #include "wx/intl.h" #include "wx/log.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include #include "wx/gtk/win_gtk.h" -#include "gdk/gdkkeysyms.h" +#include + +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data @@ -30,51 +47,37 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxNotebookPage +// debug //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +#ifdef __WXDEBUG__ + +extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); + +#endif + +//----------------------------------------------------------------------------- +// wxGtkNotebookPage +//----------------------------------------------------------------------------- + +class wxGtkNotebookPage: public wxObject { public: - wxNotebookPage() + wxGtkNotebookPage() { - m_id = -1; m_text = ""; m_image = -1; m_page = (GtkNotebookPage *) NULL; - m_client = (wxWindow *) NULL; - m_parent = (GtkNotebook *) NULL; + m_client = (wxNotebookPage *) NULL; m_box = (GtkWidget *) NULL; - m_added = FALSE; - } - - /* - mark page as "added' to the notebook, return FALSE if the page was - already added - */ - - bool Add() - { - if ( WasAdded() ) - return FALSE; - - m_added = TRUE; - return TRUE; } - bool WasAdded() const { return m_added; } - - int m_id; wxString m_text; int m_image; GtkNotebookPage *m_page; GtkLabel *m_label; - wxWindow *m_client; - GtkNotebook *m_parent; + wxNotebookPage *m_client; GtkWidget *m_box; // in which the label and image are packed - -private: - bool m_added; }; //----------------------------------------------------------------------------- @@ -83,19 +86,47 @@ private: static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint nPage, - gpointer data) + gint page, + wxNotebook *notebook ) { - wxNotebook *notebook = (wxNotebook *)data; + static bool s_inPageChange = FALSE; + + // are you trying to call SetSelection() from a notebook event handler? + // you shouldn't! + wxCHECK_RET( !s_inPageChange, + _T("gtk_notebook_page_change_callback reentered") ); + + s_inPageChange = TRUE; + if (g_isIdle) + wxapp_install_idle_handler(); int old = notebook->GetSelection(); - // TODO: emulate PAGE_CHANGING event + wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, + notebook->GetId(), page, old ); + eventChanging.SetEventObject( notebook ); - wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), nPage, old ); - event.SetEventObject( notebook ); - notebook->GetEventHandler()->ProcessEvent( event ); + if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) && + !eventChanging.IsAllowed() ) + { + /* program doesn't allow the page change */ + gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), + "switch_page" ); + } + else // change allowed + { + // make wxNotebook::GetSelection() return the correct (i.e. consistent + // with wxNotebookEvent::GetSelection()) value even though the page is + // not really changed in GTK+ + notebook->m_selection = page; + + wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, + notebook->GetId(), page, old ); + eventChanged.SetEventObject( notebook ); + notebook->GetEventHandler()->ProcessEvent( eventChanged ); + } + + s_inPageChange = FALSE; } //----------------------------------------------------------------------------- @@ -104,82 +135,94 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { + if (g_isIdle) + wxapp_install_idle_handler(); + if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && (win->m_width == alloc->width) && (win->m_height == alloc->height)) { -// return; + return; } - + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - if (win->GetAutoLayout()) win->Layout(); + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate + here in order to make repositioning after resizing to take effect. */ + if ((gtk_major_version == 1) && + (gtk_minor_version == 2) && + (gtk_micro_version < 6) && + (win->m_wxwindow) && + (GTK_WIDGET_REALIZED(win->m_wxwindow))) + { + gtk_widget_size_allocate( win->m_wxwindow, alloc ); + } } //----------------------------------------------------------------------------- -// "key_press_event" +// "realize" from m_widget //----------------------------------------------------------------------------- static gint -gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) +gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { - if (g_blockEventsOnDrag) return FALSE; - - if (!notebook->HasVMT()) return FALSE; + if (g_isIdle) + wxapp_install_idle_handler(); - /* 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 */ + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize + here in order to make repositioning before showing to take effect. */ + gtk_widget_queue_resize( win->m_widget ); - if (gdk_event->keyval != GDK_Down) return FALSE; - - if (notebook != notebook->FindFocus()) return FALSE; - - if (notebook->m_pages.GetCount() == 0) return FALSE; + return FALSE; +} - wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() ); +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- - if (!node) return FALSE; +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); - wxNotebookPage *page = (wxNotebookPage*) node->Data(); + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; - // don't let others the key event - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + /* 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(); + + wxNavigationKeyEvent event; + event.SetEventObject( win ); + /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ + event.SetDirection( (gdk_event->keyval == GDK_Tab) ); + /* 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 )) + { + page->m_client->SetFocus(); + } - page->m_client->SetFocus(); + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) +static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) { - wxNotebookPage *page = new wxNotebookPage(); - - page->m_id = parent->GetPageCount(); - - page->m_box = gtk_hbox_new (FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(page->m_box), 2); - - GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - - page->m_client = child; - gtk_notebook_append_page( notebook, child->m_widget, page->m_box ); - - page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - - page->m_parent = notebook; - - gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - - wxASSERT_MSG( page->m_page, _T("Notebook page creation error") ); - - parent->m_pages.Append( page ); + /* we don't do anything here but pray */ } //----------------------------------------------------------------------------- @@ -195,8 +238,10 @@ END_EVENT_TABLE() void wxNotebook::Init() { m_imageList = (wxImageList *) NULL; + m_ownsImageList = FALSE; m_pages.DeleteContents( TRUE ); - m_idHandler = 0; + m_selection = -1; + m_themeEnabled = TRUE; } wxNotebook::wxNotebook() @@ -214,11 +259,12 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { - // don't generate change page events any more - if (m_idHandler != 0) - gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler); + /* 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, @@ -229,26 +275,44 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_acceptsFocus = TRUE; m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxNoteBook creation failed") ); + return FALSE; + } + 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 ); - m_idHandler = gtk_signal_connect ( - GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), - (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); - m_parent->AddChild( this ); + m_parent->DoAddChild( this ); - (m_parent->m_insertCallback)( m_parent, this ); + if (m_windowStyle & wxNB_RIGHT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); + if (m_windowStyle & wxNB_LEFT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); + if (m_windowStyle & wxNB_BOTTOM) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); PostCreation(); + SetFont( parent->GetFont() ); + + gtk_signal_connect( GTK_OBJECT(m_widget), "realize", + GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); + Show( TRUE ); return TRUE; @@ -256,155 +320,105 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - if (m_pages.Number() == 0) return -1; - - GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page; - if (!g_page) return -1; - - wxNotebookPage *page = (wxNotebookPage *) NULL; - - wxNode *node = m_pages.First(); - while (node) + if ( m_selection == -1 ) { - page = (wxNotebookPage*)node->Data(); + GList *pages = GTK_NOTEBOOK(m_widget)->children; - if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL)) + if (g_list_length(pages) != 0) { - // page->m_page is NULL directly after gtk_notebook_append. gtk emits - // "switch_page" then and we ask for GetSelection() in the handler for - // "switch_page". otherwise m_page should never be NULL. all this - // might also be wrong. - break; - } - node = node->Next(); - } + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") ); - - return page->m_id; -} - -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++; + gpointer cur = notebook->cur_page; + if ( cur != NULL ) + { + wxConstCast(this, wxNotebook)->m_selection = + g_list_index( pages, cur ); + } + } } - return n; -} - -int wxNotebook::GetRowCount() const -{ - return 1; + return m_selection; } wxString wxNotebook::GetPageText( int page ) const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return ""; + return wxT(""); } int wxNotebook::GetPageImage( int page ) const { - wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_image; else - return 0; + return -1; } -wxNotebookPage* wxNotebook::GetNotebookPage(int page) const +wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxNotebookPage *nb_page = (wxNotebookPage *) NULL; + wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - wxNode *node = m_pages.First(); - while (node) - { - nb_page = (wxNotebookPage*)node->Data(); - if (nb_page->m_id == page) - return nb_page; - node = node->Next(); - } + wxNode *node = m_pages.Nth( page ); - wxFAIL_MSG( _T("Notebook page not found!") ); - - return (wxNotebookPage *) NULL; + return (wxGtkNotebookPage *) node->Data(); } int wxNotebook::SetSelection( int page ) { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); - - int selOld = GetSelection(); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - if (!nb_page) return -1; + wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") ); - 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; + int selOld = GetSelection(); - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); + // 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 bForward ) +void wxNotebook::SetImageList( wxImageList* imageList ) { - wxCHECK_RET( m_widget != NULL, _T("invalid notebook") ); - - int sel = GetSelection(); - int max = GetPageCount(); - - if (bForward) - SetSelection( sel == max ? 0 : sel + 1 ); - else - SetSelection( sel == 0 ? max-1 : sel - 1 ); + if (m_ownsImageList) delete m_imageList; + m_imageList = imageList; + m_ownsImageList = FALSE; } -void wxNotebook::SetImageList( wxImageList* imageList ) +void wxNotebook::AssignImageList( wxImageList* imageList ) { - m_imageList = imageList; + SetImageList(imageList); + m_ownsImageList = TRUE; } bool wxNotebook::SetPageText( int page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); - wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") ); + wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); 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, nb_page->m_text.mbc_str() ); + return TRUE; } @@ -412,7 +426,7 @@ 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); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -439,20 +453,20 @@ bool wxNotebook::SetPageImage( int page, int image ) 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; + { + pixmapwid = GTK_WIDGET(child->data); + break; } - child = child->next; - } + 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; @@ -495,105 +509,111 @@ bool wxNotebook::SetPageImage( int page, int image ) void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) { - wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } -void wxNotebook::SetTabSize(const wxSize& sz) +void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { - wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); } bool wxNotebook::DeleteAllPages() { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - wxNode *page_node = m_pages.First(); - while (page_node) - { - wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); - - DeletePage( page->m_id ); - - page_node = m_pages.First(); - } + while (m_pages.GetCount() > 0) + DeletePage( m_pages.GetCount()-1 ); return TRUE; } bool wxNotebook::DeletePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxGtkNotebookPage* nb_page = GetNotebookPage(page); + wxCHECK_MSG( nb_page, FALSE, _T("invalid page in wxNotebook::DeletePage") ); - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) + // 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 (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; + m_selection = GetSelection(); + if ( m_selection == (int)m_pages.GetCount() - 1 ) + { + // the index will become invalid after the page is deleted + m_selection = -1; + } } - wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); - - delete nb_page->m_client; - + nb_page->m_client->Destroy(); m_pages.DeleteObject( nb_page ); return TRUE; } -bool wxNotebook::RemovePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxGtkNotebookPage* nb_page = GetNotebookPage(page); - 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( nb_page, NULL, _T("wxNotebook::RemovePage: invalid page") ); - wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); - - gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); + 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 ); - return TRUE; + return pageRemoved; } -bool wxNotebook::AddPage(wxWindow* 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, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("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( win->GetParent() == this, FALSE, + wxT("Can't add a page whose parent is not the notebook!") ); - wxNotebookPage *page = (wxNotebookPage *) NULL; + /* 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 ); - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if ( page->m_client == win ) break; - node = node->Next(); - } + if (m_themeEnabled) + win->SetThemeEnabled(TRUE); - wxCHECK_MSG( page != NULL, FALSE, - _T("Can't add a page whose parent is not the notebook!") ); + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxCHECK_MSG( page->Add(), FALSE, - _T("Can't add the same page twice to a notebook.") ); + wxGtkNotebookPage *page = new wxGtkNotebookPage(); + + if (position < 0) + m_pages.Append( page ); + else + m_pages.Insert( m_pages.Nth( position ), page ); + + page->m_client = win; + + page->m_box = gtk_hbox_new( FALSE, 0 ); + gtk_container_border_width( GTK_CONTAINER(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 ); + else + gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position ); + + page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; + + /* set the label image */ + page->m_image = imageId; if (imageId != -1) { @@ -614,23 +634,36 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, gtk_widget_show(pixmapwid); } - /* then set the attributes */ + /* set the label text */ 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); + if (page->m_text.IsEmpty()) page->m_text = wxT(""); - /* @@@: what does this do? do we still need it? - gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */ + 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 ); - gtk_widget_show((GtkWidget *)page->m_label); + /* show the label */ + gtk_widget_show( GTK_WIDGET(page->m_label) ); - if (select) SetSelection( GetPageCount()-1 ); + if (select && (m_pages.GetCount() > 1)) + { + if (position < 0) + SetSelection( GetPageCount()-1 ); + else + SetSelection( position ); + } + + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); 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()) @@ -639,16 +672,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.Skip(); } -wxWindow *wxNotebook::GetPage( int page ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") ); - - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return (wxWindow *) NULL; - else - return nb_page->m_client; -} +#if wxUSE_CONSTRAINTS // override these 2 functions to do nothing: everything is done in OnSize void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) @@ -662,15 +686,26 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) return TRUE; } +#endif + void wxNotebook::ApplyWidgetStyle() { + // TODO, font for labels etc + SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } +bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) +{ + return ((m_widget->window == window) || + (GTK_NOTEBOOK(m_widget)->panel == window)); +} + //----------------------------------------------------------------------------- // wxNotebookEvent //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) +#endif