X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c98826242f849bc2ab888c33f547c59dcf8db2fa..b796ba39311830b11e375de10ca2378f501c5b8c:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index bf86abbf3b..7ac1cb4666 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -26,7 +26,6 @@ #include "wx/fontutil.h" #include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" #include @@ -60,13 +59,11 @@ public: wxGtkNotebookPage() { m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; + m_box = NULL; } wxString m_text; int m_image; - GtkNotebookPage *m_page; GtkLabel *m_label; GtkWidget *m_box; // in which the label and image are packed }; @@ -91,7 +88,7 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget, if ( !notebook->SendPageChangingEvent(page) ) { // program doesn't allow the page change - g_signal_stop_emission_by_name(notebook->m_widget, "switch_page"); + g_signal_stop_emission_by_name( widget, "switch_page" ); } else { @@ -102,9 +99,9 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget, } extern "C" { -static void gtk_notebook_page_changed_callback( GtkNotebook *widget, +static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget), GtkNotebookPage *WXUNUSED(gpage), - guint page, + guint WXUNUSED(page), wxNotebook *notebook ) { int old = notebook->m_oldSelection; @@ -112,132 +109,11 @@ static void gtk_notebook_page_changed_callback( GtkNotebook *widget, } } -//----------------------------------------------------------------------------- -// "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 ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - - /* 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 ); - } -} -} - -//----------------------------------------------------------------------------- -// "realize" from m_widget -//----------------------------------------------------------------------------- - -extern "C" { -static void -gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - /* 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 ); -} -} - -//----------------------------------------------------------------------------- -// "key_press_event" -//----------------------------------------------------------------------------- - -extern "C" { -static gboolean -gtk_notebook_key_press_callback( GtkWidget *widget, - GdkEventKey *gdk_event, - wxNotebook *notebook ) -{ - // don't need to install idle handler, its done from "event" signal - - if (!notebook->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) 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(); - - // 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; - } - - gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page ); - - return TRUE; - } - - /* 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->GetEventHandler()->ProcessEvent( event ) ) - { - client->SetFocus(); - } - - return TRUE; - } - - return FALSE; -} -} - //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) +static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) { // 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 @@ -258,9 +134,9 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) // 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() @@ -295,9 +171,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - m_needParent = true; - m_acceptsFocus = true; - m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; + m_insertCallback = wxInsertChildInNotebook; if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) style |= wxBK_TOP; @@ -329,14 +203,8 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxBK_BOTTOM) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); - g_signal_connect (m_widget, "key_press_event", - G_CALLBACK (gtk_notebook_key_press_callback), this); - PostCreation(size); - g_signal_connect (m_widget, "realize", - G_CALLBACK (gtk_notebook_realized_callback), this); - return true; } @@ -388,26 +256,22 @@ int wxNotebook::DoSetSelection( size_t page, int flags ) if ( !(flags & SetSelection_SendEvent) ) { - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) gtk_notebook_page_changing_callback, - this); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) gtk_notebook_page_changed_callback, - this); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_notebook_page_changed_callback, this); } gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); if ( !(flags & SetSelection_SendEvent) ) { - // reconnect to signals - - g_signal_connect (m_widget, "switch_page", - G_CALLBACK (gtk_notebook_page_changing_callback), this); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); - g_signal_connect_after (m_widget, "switch_page", - G_CALLBACK (gtk_notebook_page_changed_callback), this); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changed_callback, this); } wxNotebookPage *client = GetPage(page); @@ -563,7 +427,12 @@ bool wxNotebook::DeleteAllPages() wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); + // We cannot remove the page yet, as GTK sends the "switch_page" + // signal before it has removed the notebook-page from its + // corresponding list. Thus, if we were to remove the page from + // m_pages at this point, the two lists of pages would be out + // of sync during the PAGE_CHANGING/PAGE_CHANGED events. + wxNotebookPage *client = GetPage(page); if ( !client ) return NULL; @@ -572,13 +441,16 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) // we don't need to unparent the client->m_widget; GTK+ will do // that for us (and will throw a warning if we do it!) - gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); + // It's safe to remove the page now. + wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete")); + wxNotebookBase::DoRemovePage(page); + wxGtkNotebookPage* p = GetNotebookPage(page); m_pagesData.DeleteObject(p); delete p; - + return client; } @@ -617,18 +489,18 @@ bool wxNotebook::InsertPage( size_t position, m_pages.Insert(win, position); + // set the label image and text + // this must be done before adding the page, as GetPageText + // and GetPageImage will otherwise return wrong values in + // the page-changed event that results from inserting the + // first page. + nb_page->m_image = imageId; + nb_page->m_text = wxStripMenuCodes(text); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); - g_signal_connect (win->m_widget, "size_allocate", - G_CALLBACK (gtk_page_size_callback), 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; + gtk_notebook_insert_page(notebook, win->m_widget, nb_page->m_box, position); if (imageId != -1) { @@ -641,10 +513,6 @@ bool wxNotebook::InsertPage( size_t position, } /* set the label text */ - - nb_page->m_text = wxStripMenuCodes(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 ); @@ -658,7 +526,7 @@ bool wxNotebook::InsertPage( size_t position, /* show the label */ gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); - + if (select && (m_pagesData.GetCount() > 1)) { SetSelection( position );