X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cbab64109b007fa1d939fe588f5e79f9105b915..977c53206a4be411999140b514507e161e1f0a04:/src/gtk1/notebook.cpp?ds=sidebyside diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index ca7fc31f13..9018d38702 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$ @@ -10,16 +10,20 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" -#if wxUSE_NOTEBOOK +#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/panel.h" -#include "wx/utils.h" #include "wx/imaglist.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" #include "wx/gtk1/private.h" @@ -27,15 +31,6 @@ #include -#include "wx/msgdlg.h" - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- @@ -66,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; @@ -95,36 +90,41 @@ 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; + notebook->m_inSwitchPage = true; if (g_isIdle) wxapp_install_idle_handler(); 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 programmatically 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; @@ -227,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 ); @@ -242,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(); } @@ -280,20 +280,17 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) - -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_inSwitchPage = false; - m_imageList = (wxImageList *) NULL; - m_selection = -1; - m_themeEnabled = TRUE; + m_imageList = NULL; + m_themeEnabled = true; } wxNotebook::wxNotebook() @@ -318,15 +315,18 @@ 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_needParent = true; + m_acceptsFocus = true; m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; + 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; + return false; } @@ -354,14 +354,14 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, 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, 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; @@ -372,8 +372,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 )); } } } @@ -383,13 +383,13 @@ int wxNotebook::GetSelection() const wxString wxNotebook::GetPageText( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return wxT(""); + return wxEmptyString; } int wxNotebook::GetPageImage( size_t page ) const @@ -405,25 +405,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(); @@ -443,7 +454,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text ) gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); - return TRUE; + return true; } bool wxNotebook::SetPageImage( size_t page, int image ) @@ -458,7 +469,7 @@ bool wxNotebook::SetPageImage( size_t 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 @@ -467,9 +478,9 @@ bool wxNotebook::SetPageImage( size_t 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; + GtkWidget *pixmapwid = NULL; if (nb_page->m_image != -1) { @@ -495,7 +506,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid); nb_page->m_image = -1; - return TRUE; /* Case 2) */ + return true; /* Case 2) */ } } @@ -505,7 +516,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(); @@ -528,7 +539,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) nb_page->m_image = image; - return TRUE; + return true; } void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) @@ -575,7 +586,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(); @@ -583,10 +594,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); @@ -627,7 +638,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 @@ -641,7 +652,7 @@ bool wxNotebook::InsertPage( size_t position, GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); if (m_themeEnabled) - win->SetThemeEnabled(TRUE); + win->SetThemeEnabled(true); GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -673,7 +684,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(); @@ -689,7 +700,7 @@ bool wxNotebook::InsertPage( size_t position, /* set the label text */ nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); + 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 ); @@ -713,7 +724,7 @@ bool wxNotebook::InsertPage( size_t position, GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); InvalidateBestSize(); - return TRUE; + return true; } // helper for HitTest(): check if the point lies inside the given widget which @@ -775,15 +786,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; } } @@ -792,7 +803,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const } if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + *flags = wxBK_HITTEST_NOWHERE; return wxNOT_FOUND; } @@ -816,7 +827,7 @@ void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) { - return TRUE; + return true; } #endif @@ -842,10 +853,4 @@ wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } -//----------------------------------------------------------------------------- -// wxNotebookEvent -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) - #endif