X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90f9b8ef0c83c09f80c2f60ad65407ba16f11a3c..30d6c59b297f98ebda1d6c14e56f289bd3b02799:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 8acf3f1fd9..780ef4d3db 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -20,10 +20,10 @@ #include "wx/utils.h" #include "wx/panel.h" #include "wx/msgdlg.h" + #include "wx/bitmap.h" #endif #include "wx/imaglist.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" #include "wx/gtk1/private.h" @@ -31,13 +31,6 @@ #include -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- @@ -68,8 +61,8 @@ public: wxGtkNotebookPage() { m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; + m_page = NULL; + m_box = NULL; } wxString m_text; @@ -97,7 +90,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), // 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") ); + wxT("gtk_notebook_page_change_callback reentered") ); notebook->m_inSwitchPage = true; if (g_isIdle) @@ -105,28 +98,33 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), int old = notebook->GetSelection(); - wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, - notebook->GetId(), page, old ); - eventChanging.SetEventObject( notebook ); - - 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 + 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 + // with wxBookCtrlEvent::GetSelection()) value even though the page is // not really changed in GTK+ - notebook->m_selection = page; + notebook->SetSelection(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 wxBookCtrlEvent::GetSelection()) value even though the page is + // not really changed in GTK+ + notebook->SetSelection(page); - wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), page, old ); - eventChanged.SetEventObject( notebook ); - notebook->GetEventHandler()->ProcessEvent( eventChanged ); + notebook->SendPageChangedEvent(old); + } } notebook->m_inSwitchPage = FALSE; @@ -229,10 +227,10 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { int sel = notebook->GetSelection(); - if (sel == -1) + if (sel == wxNOT_FOUND) return TRUE; wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel); - wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); + wxCHECK_MSG( nb_page, FALSE, wxT("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; event.SetEventObject( notebook ); @@ -244,7 +242,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk event.SetCurrentFocus( notebook ); wxNotebookPage *client = notebook->GetPage(sel); - if ( !client->GetEventHandler()->ProcessEvent( event ) ) + if ( !client->HandleWindowEvent( event ) ) { client->SetFocus(); } @@ -282,9 +280,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() @@ -293,8 +291,7 @@ void wxNotebook::Init() m_padding = 0; m_inSwitchPage = false; - m_imageList = (wxImageList *) NULL; - m_selection = -1; + m_imageList = NULL; m_themeEnabled = true; } @@ -364,9 +361,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") ); - if ( m_selection == -1 ) + if ( m_selection == wxNOT_FOUND ) { GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; @@ -377,8 +374,8 @@ int wxNotebook::GetSelection() const gpointer cur = notebook->cur_page; if ( cur != NULL ) { - wxConstCast(this, wxNotebook)->m_selection = - g_list_index( nb_pages, cur ); + const_cast(this)-> + SetSelection(g_list_index( nb_pages, cur )); } } } @@ -410,25 +407,36 @@ int wxNotebook::GetPageImage( size_t page ) const wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); + wxCHECK_MSG( page < (int)m_pagesData.GetCount(), NULL, wxT("invalid notebook index") ); return m_pagesData.Item(page)->GetData(); } -int wxNotebook::SetSelection( size_t page ) +int wxNotebook::DoSetSelection( size_t page, int flags ) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") ); wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); + if ( !(flags & SetSelection_SendEvent) ) + m_skipNextPageChangeEvent = true; + // cache the selection m_selection = page; gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); + // gtk_notebook_set_current_page is supposed to emit the switch-page signal + // which should be caught by our gtk_notebook_page_change_callback which + // should have reset the flag to false, check it: + wxASSERT_LEVEL_2_MSG( + (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent, + "internal error in selection events generation" + ); + wxNotebookPage *client = GetPage(page); if ( client ) client->SetFocus(); @@ -474,7 +482,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) if (image == -1 && nb_page->m_image == -1) return true; /* Case 1): Nothing to do. */ - GtkWidget *pixmapwid = (GtkWidget*) NULL; + GtkWidget *pixmapwid = NULL; if (nb_page->m_image != -1) { @@ -510,7 +518,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) /* Construct the new pixmap */ const wxBitmap *bmp = m_imageList->GetBitmapPtr(image); GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; + GdkBitmap *mask = NULL; if ( bmp->GetMask() ) { mask = bmp->GetMask()->GetBitmap(); @@ -580,7 +588,7 @@ bool wxNotebook::DeleteAllPages() while (m_pagesData.GetCount() > 0) DeletePage( m_pagesData.GetCount()-1 ); - wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") ); InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); @@ -588,10 +596,10 @@ bool wxNotebook::DeleteAllPages() wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - if ( m_selection != -1 && (size_t)m_selection >= page ) + if ( m_selection != wxNOT_FOUND && (size_t)m_selection >= page ) { // the index will become invalid after the page is deleted - m_selection = -1; + m_selection = wxNOT_FOUND; } wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); @@ -632,7 +640,7 @@ bool wxNotebook::InsertPage( size_t position, wxT("Can't add a page whose parent is not the notebook!") ); wxCHECK_MSG( position <= GetPageCount(), FALSE, - _T("invalid page index in wxNotebookPage::InsertPage()") ); + wxT("invalid page index in wxNotebookPage::InsertPage()") ); // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback // why this has to be done. NOTE: using gtk_widget_unparent here does not @@ -678,7 +686,7 @@ bool wxNotebook::InsertPage( size_t position, const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; + GdkBitmap *mask = NULL; if ( bmp->GetMask() ) { mask = bmp->GetMask()->GetBitmap(); @@ -780,15 +788,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) { - *flags = wxNB_HITTEST_ONICON; + *flags = wxBK_HITTEST_ONICON; } else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) { - *flags = wxNB_HITTEST_ONLABEL; + *flags = wxBK_HITTEST_ONLABEL; } else { - *flags = wxNB_HITTEST_ONITEM; + *flags = wxBK_HITTEST_ONITEM; } } @@ -797,7 +805,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const } if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + *flags = wxBK_HITTEST_NOWHERE; return wxNOT_FOUND; } @@ -847,10 +855,4 @@ wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } -//----------------------------------------------------------------------------- -// wxNotebookEvent -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) - #endif