X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..e60f8377beb9c1f96689383ee9642de20168cc21:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index a690de0dea..37fa1fd8e5 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk1/notebook.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,21 +7,36 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "notebook.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_NOTEBOOK #include "wx/notebook.h" -#include "wx/panel.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/panel.h" + #include "wx/msgdlg.h" + #include "wx/bitmap.h" +#endif + #include "wx/imaglist.h" -#include "wx/intl.h" -#include "wx/log.h" +#include "wx/fontutil.h" + +#include "wx/gtk1/private.h" +#include "wx/gtk1/win_gtk.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#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 @@ -34,86 +49,104 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxNotebookPage +// wxGtkNotebookPage //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +// 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: - wxNotebookPage() - { - m_id = -1; - m_text = ""; - m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_client = (wxWindow *) NULL; - m_parent = (GtkNotebook *) 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; - GtkWidget *m_box; // in which the label and image are packed - -private: - bool m_added; + wxGtkNotebookPage() + { + m_image = -1; + m_page = (GtkNotebookPage *) NULL; + m_box = (GtkWidget *) NULL; + } + + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + GtkWidget *m_box; // in which the label and image are packed }; + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxGtkNotebookPagesList) + + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- +extern "C" { static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint nPage, - gpointer data) + gint page, + wxNotebook *notebook ) { - if (g_isIdle) wxapp_install_idle_handler(); + // are you trying to call SetSelection() from a notebook event handler? + // you shouldn't! + wxCHECK_RET( !notebook->m_inSwitchPage, + _T("gtk_notebook_page_change_callback reentered") ); - wxNotebook *notebook = (wxNotebook *)data; + notebook->m_inSwitchPage = true; + if (g_isIdle) + wxapp_install_idle_handler(); int old = notebook->GetSelection(); - // TODO: emulate PAGE_CHANGING event + if (notebook->m_skipNextPageChangeEvent) + { + // this event was programatically generated by ChangeSelection() and thus must + // be skipped + notebook->m_skipNextPageChangeEvent = false; + + // 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; + } + else + { + if ( !notebook->SendPageChangingEvent(page) ) + { + // 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; + + notebook->SendPageChangedEvent(old); + } + } - wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), nPage, old ); - event.SetEventObject( notebook ); - notebook->GetEventHandler()->ProcessEvent( event ); + notebook->m_inSwitchPage = FALSE; +} } //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && @@ -122,47 +155,111 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* { 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 //----------------------------------------------------------------------------- +extern "C" { 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_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return FALSE; + /* 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 (!notebook->HasVMT()) return FALSE; + 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 */ +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- - if (gdk_event->keyval != GDK_Down) return FALSE; +extern "C" { +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); - if (notebook != notebook->FindFocus()) return FALSE; + if (!notebook->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; - if (notebook->m_pages.GetCount() == 0) return FALSE; + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right)) + { + int page; + int nMax = notebook->GetPageCount(); + if ( nMax-- ) // decrement it to get the last valid index + { + int nSel = notebook->GetSelection(); - wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() ); + // change selection wrapping if it becomes invalid + page = (gdk_event->keyval != GDK_Left) ? nSel == nMax ? 0 + : nSel + 1 + : nSel == 0 ? nMax + : nSel - 1; + } + else // notebook is empty, no next page + { + return FALSE; + } - if (!node) return FALSE; + // m_selection = page; + gtk_notebook_set_page( GTK_NOTEBOOK(widget), page ); - wxNotebookPage *page = (wxNotebookPage*) node->Data(); + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } - // 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)) + { + int sel = notebook->GetSelection(); + if (sel == -1) + return TRUE; + wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel); + wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); + + wxNavigationKeyEvent event; + event.SetEventObject( notebook ); + /* 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) || + (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) ); + event.SetCurrentFocus( notebook ); + + wxNotebookPage *client = notebook->GetPage(sel); + if ( !client->HandleWindowEvent( event ) ) + { + client->SetFocus(); + } - page->m_client->SetFocus(); + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } - return TRUE; + return FALSE; +} } //----------------------------------------------------------------------------- @@ -171,45 +268,39 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNo static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* 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); + // Hack Alert! (Part I): This sets the notebook as the parent of the child + // widget, and takes care of some details such as updating the state and + // style of the child to reflect its new location. We do this early + // because without it GetBestSize (which is used to set the initial size + // of controls if an explicit size is not given) will often report + // incorrect sizes since the widget's style context is not fully known. + // See bug #901694 for details + // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863) + gtk_widget_set_parent(child->m_widget, 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 ); + // NOTE: This should be considered a temporary workaround until we can + // work out the details and implement delaying the setting of the initial + // size of widgets until the size is really needed. } //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase) -BEGIN_EVENT_TABLE(wxNotebook, wxControl) +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() void wxNotebook::Init() { + m_padding = 0; + m_inSwitchPage = false; + m_imageList = (wxImageList *) NULL; - m_pages.DeleteContents( TRUE ); - m_idHandler = 0; + m_selection = -1; + m_themeEnabled = true; } wxNotebook::wxNotebook() @@ -227,205 +318,162 @@ 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); - DeleteAllPages(); } 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; + m_needParent = true; + m_acceptsFocus = true; m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; - PreCreation( parent, id, pos, size, style, name ); + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + style |= wxBK_TOP; + + 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(); 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 & wxBK_RIGHT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); + if (m_windowStyle & wxBK_LEFT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); + if (m_windowStyle & wxBK_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(); + PostCreation(size); - Show( TRUE ); + gtk_signal_connect( GTK_OBJECT(m_widget), "realize", + GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); - return TRUE; + return true; } int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, _T("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; + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxNode *node = m_pages.First(); - while (node) + if ( m_selection == -1 ) { - page = (wxNotebookPage*)node->Data(); + GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; - if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL)) + if (g_list_length(nb_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(); - } - - wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") ); - - return page->m_id; -} + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); -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( nb_pages, cur ); + } + } } - return n; + return m_selection; } -int wxNotebook::GetRowCount() const +wxString wxNotebook::GetPageText( size_t page ) const { - return 1; -} + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); -wxString wxNotebook::GetPageText( int page ) const -{ - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") ); - - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return ""; + return wxEmptyString; } -int wxNotebook::GetPageImage( int page ) const +int wxNotebook::GetPageImage( size_t 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") ); - - wxNotebookPage *nb_page = (wxNotebookPage *) NULL; + wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxNode *node = m_pages.First(); - while (node) - { - nb_page = (wxNotebookPage*)node->Data(); - if (nb_page->m_id == page) - return nb_page; - node = node->Next(); - } - - wxFAIL_MSG( _T("Notebook page not found!") ); + wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - return (wxNotebookPage *) NULL; + return m_pagesData.Item(page)->GetData(); } -int wxNotebook::SetSelection( int page ) +int wxNotebook::DoSetSelection( size_t page, int flags ) { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + + wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return -1; + if ( !(flags & SetSelection_SendEvent) ) + m_skipNextPageChangeEvent = true; + + // cache the selection + m_selection = page; + gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) +#ifdef __WXDEBUG__ + if ( !(flags & SetSelection_SendEvent) ) { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; + // gtk_notebook_set_current_page will emit the switch-page signal which will be + // caught by our gtk_notebook_page_change_callback which should have reset the + // flag to false: + wxASSERT(!m_skipNextPageChangeEvent); } +#endif // __WXDEBUG__ - if (!child) return -1; - - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); + wxNotebookPage *client = GetPage(page); + if ( client ) + client->SetFocus(); return selOld; } -void wxNotebook::AdvanceSelection( bool bForward ) +bool wxNotebook::SetPageText( size_t page, const wxString &text ) { - wxCHECK_RET( m_widget != NULL, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - int sel = GetSelection(); - int max = GetPageCount(); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (bForward) - SetSelection( sel == max ? 0 : sel + 1 ); - else - SetSelection( sel == 0 ? max-1 : sel - 1 ); -} - -void wxNotebook::SetImageList( wxImageList* imageList ) -{ - m_imageList = imageList; -} - -bool wxNotebook::SetPageText( int page, const wxString &text ) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); - - wxNotebookPage* 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()); - - return TRUE; + 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 */ - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -433,7 +481,7 @@ bool wxNotebook::SetPageImage( int page, int image ) * Not enabled because it may break existing (stupid) code that * manipulates the imagelist to cycle images */ - /* if (image == nb_page->m_image) return TRUE; */ + /* if (image == nb_page->m_image) return true; */ /* For different cases: 1) no image -> no image @@ -442,7 +490,7 @@ bool wxNotebook::SetPageImage( int page, int image ) 4) image -> image */ if (image == -1 && nb_page->m_image == -1) - return TRUE; /* Case 1): Nothing to do. */ + return true; /* Case 1): Nothing to do. */ GtkWidget *pixmapwid = (GtkWidget*) NULL; @@ -452,25 +500,25 @@ 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; - return TRUE; /* Case 2) */ + return true; /* Case 2) */ } } @@ -478,7 +526,7 @@ bool wxNotebook::SetPageImage( int page, int image ) wxASSERT( m_imageList != NULL ); /* Just in case */ /* Construct the new pixmap */ - const wxBitmap *bmp = m_imageList->GetBitmap(image); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(image); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -492,7 +540,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 @@ -503,116 +551,150 @@ bool wxNotebook::SetPageImage( int page, int image ) nb_page->m_image = image; - return TRUE; + return true; } 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) ) +void wxNotebook::SetPadding( const wxSize &padding ) { - wxFAIL_MSG( _T("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& 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(); + while (m_pagesData.GetCount() > 0) + DeletePage( m_pagesData.GetCount()-1 ); - DeletePage( page->m_id ); + wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); - page_node = m_pages.First(); - } - - return TRUE; + InvalidateBestSize(); + return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; - - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) + if ( m_selection != -1 && (size_t)m_selection >= page ) { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; + // the index will become invalid after the page is deleted + m_selection = -1; } - wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); + 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 ); - delete nb_page->m_client; + // 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 ); - m_pages.DeleteObject( nb_page ); + gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); - return TRUE; + 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 client; } -bool wxNotebook::RemovePage( int page ) +bool wxNotebook::InsertPage( size_t position, + wxNotebookPage* win, + const wxString& text, + bool select, + int imageId ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - 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( win->GetParent() == this, FALSE, + wxT("Can't add a page whose parent is not the notebook!") ); - wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); + wxCHECK_MSG( position <= GetPageCount(), FALSE, + _T("invalid page index in wxNotebookPage::InsertPage()") ); - gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); + // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback + // why this has to be done. NOTE: using gtk_widget_unparent here does not + // work as it seems to undo too much and will cause errors in the + // gtk_notebook_insert_page below, so instead just clear the parent by + // hand here. + win->m_widget->parent = NULL; - m_pages.DeleteObject( nb_page ); + // 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 ); - return TRUE; -} + if (m_themeEnabled) + win->SetThemeEnabled(true); -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, - bool select, int imageId) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - /* we've created the notebook page in AddChild(). Now we just have to set - the caption for the page and set the others parameters. */ + wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); - wxNotebookPage *page = (wxNotebookPage *) NULL; + if ( position == GetPageCount() ) + m_pagesData.Append( nb_page ); + else + m_pagesData.Insert( position, nb_page ); - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if ( page->m_client == win ) break; - node = node->Next(); - } + m_pages.Insert(win, position); - wxCHECK_MSG( page != NULL, FALSE, - _T("Can't add a page whose parent is not the notebook!") ); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); + gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); - wxCHECK_MSG( page->Add(), FALSE, - _T("Can't add the same page twice to a notebook.") ); + gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", + GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); + + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); + + nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; + + /* set the label image */ + nb_page->m_image = imageId; if (imageId != -1) { wxASSERT( m_imageList != NULL ); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -622,26 +704,120 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, 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); } - /* 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); + /* set the label text */ + + nb_page->m_text = text; + if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString; + + 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 ); + + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); + gtk_rc_style_unref(style); + } + + /* show the label */ + gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); + if (select && (m_pagesData.GetCount() > 1)) + { + SetSelection( position ); + } + + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + + InvalidateBestSize(); + return true; +} + +// helper for HitTest(): check if the point lies inside the given widget which +// is the child of the notebook whose position and border size are passed as +// parameters +static bool +IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, + gint x, gint y, gint border = 0) +{ + return + (pt.x >= w->allocation.x - x - border) && + (pt.x <= w->allocation.x - x + border + w->allocation.width) && + (pt.y >= w->allocation.y - y - border) && + (pt.y <= w->allocation.y - y + border + w->allocation.height); +} + +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const +{ + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; + + const size_t count = GetPageCount(); + size_t i = 0; - /* @@@: what does this do? do we still need it? - gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */ + // MR: Code to fix HitTest index return when tabs are scrolled. + // No idea if it would work for GTK1 +#if 0 + GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); + if (gtk_notebook_get_scrollable(notebook)); + i = g_list_position( notebook->children, notebook->first_tab ); +#endif - gtk_widget_show((GtkWidget *)page->m_label); + for ( ; i < count; i++ ) + { + wxGtkNotebookPage* nb_page = GetNotebookPage(i); + GtkWidget *box = nb_page->m_box; - if (select) SetSelection( GetPageCount()-1 ); + // VZ: don't know how to find the border width in GTK+ 1.2 + const gint border = 0; + if ( IsPointInsideWidget(pt, box, x, y, border) ) + { + // ok, we're inside this tab -- now find out where, if needed + if ( flags ) + { + GtkWidget *pixmap = NULL; + + GList *children = gtk_container_children(GTK_CONTAINER(box)); + for ( GList *child = children; child; child = child->next ) + { + if ( GTK_IS_PIXMAP(child->data) ) + { + pixmap = GTK_WIDGET(child->data); + break; + } + } + + if ( children ) + g_list_free(children); + + if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) + { + *flags = wxBK_HITTEST_ONICON; + } + else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) + { + *flags = wxBK_HITTEST_ONLABEL; + } + else + { + *flags = wxBK_HITTEST_ONITEM; + } + } - return TRUE; + return i; + } + } + + if ( flags ) + *flags = wxBK_HITTEST_NOWHERE; + + return wxNOT_FOUND; } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) @@ -652,16 +828,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) ) @@ -672,13 +839,30 @@ void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) { - return TRUE; + return true; +} + +#endif + +void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); + size_t cnt = m_pagesData.GetCount(); + for (size_t i = 0; i < cnt; i++) + gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style); } -void wxNotebook::ApplyWidgetStyle() +bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return ((m_widget->window == window) || + (NOTEBOOK_PANEL(m_widget) == window)); +} + +// static +wxVisualAttributes +wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } //----------------------------------------------------------------------------- @@ -687,3 +871,4 @@ void wxNotebook::ApplyWidgetStyle() IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) +#endif