X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd090f77eea26b02077738357e45a7a7645577d6..758127221440af60e7416da0f2eb04579340fa6d:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 54a4ebb1cb..b8dfb49c81 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,25 +10,33 @@ // 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" +// FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width +#include +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#endif + #include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" #include -#include "wx/msgdlg.h" - // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- @@ -36,13 +44,6 @@ 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 //----------------------------------------------------------------------------- @@ -79,7 +80,7 @@ public: #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGtkNotebookPagesList); +WX_DEFINE_LIST(wxGtkNotebookPagesList) //----------------------------------------------------------------------------- @@ -89,7 +90,7 @@ WX_DEFINE_LIST(wxGtkNotebookPagesList); extern "C" { static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint page, + guint page, wxNotebook *notebook ) { // are you trying to call SetSelection() from a notebook event handler? @@ -97,7 +98,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), wxCHECK_RET( !notebook->m_inSwitchPage, _T("gtk_notebook_page_change_callback reentered") ); - notebook->m_inSwitchPage = TRUE; + notebook->m_inSwitchPage = true; if (g_isIdle) wxapp_install_idle_handler(); @@ -111,8 +112,8 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), !eventChanging.IsAllowed() ) { /* program doesn't allow the page change */ - gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), - "switch_page" ); + g_signal_stop_emission_by_name (notebook->m_widget, + "switch_page"); } else // change allowed { @@ -127,7 +128,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), notebook->GetEventHandler()->ProcessEvent( eventChanged ); } - notebook->m_inSwitchPage = FALSE; + notebook->m_inSwitchPage = false; } } @@ -169,7 +170,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* //----------------------------------------------------------------------------- extern "C" { -static gint +static void gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { if (g_isIdle) @@ -178,8 +179,6 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) /* 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 ); - - return FALSE; } } @@ -188,7 +187,10 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) //----------------------------------------------------------------------------- extern "C" { -static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) +static gboolean +gtk_notebook_key_press_callback( GtkWidget *widget, + GdkEventKey *gdk_event, + wxNotebook *notebook ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -217,9 +219,9 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk } // m_selection = page; - gtk_notebook_set_page( GTK_NOTEBOOK(widget), page ); + gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page ); - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -247,7 +249,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk client->SetFocus(); } - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -289,11 +291,11 @@ 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_themeEnabled = true; } wxNotebook::wxNotebook() @@ -318,15 +320,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; } @@ -334,27 +339,27 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK (gtk_notebook_page_change_callback), this); m_parent->DoAddChild( this ); - if (m_windowStyle & wxNB_RIGHT) + if (m_windowStyle & wxBK_RIGHT) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); - if (m_windowStyle & wxNB_LEFT) + if (m_windowStyle & wxBK_LEFT) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); - if (m_windowStyle & wxNB_BOTTOM) + 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 ); + g_signal_connect (m_widget, "key_press_event", + G_CALLBACK (gtk_notebook_key_press_callback), this); PostCreation(size); - gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); + g_signal_connect (m_widget, "realize", + G_CALLBACK (gtk_notebook_realized_callback), this); - return TRUE; + return true; } int wxNotebook::GetSelection() const @@ -383,13 +388,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 @@ -422,7 +427,7 @@ int wxNotebook::SetSelection( size_t page ) // cache the selection m_selection = page; - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); + gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); wxNotebookPage *client = GetPage(page); if ( client ) @@ -433,17 +438,17 @@ int wxNotebook::SetSelection( size_t page ) bool wxNotebook::SetPageText( size_t page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); - wxCHECK_MSG( nb_page, FALSE, wxT("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, wxGTK_CONV( nb_page->m_text ) ); + gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); - return TRUE; + return true; } bool wxNotebook::SetPageImage( size_t page, int image ) @@ -452,13 +457,13 @@ bool wxNotebook::SetPageImage( size_t page, int image ) wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + if (!nb_page) return false; /* Optimization posibility: return immediately if image unchanged. * 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,7 +472,7 @@ 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; @@ -475,7 +480,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) { /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */ - GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box)); + GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box)); while (child) { if (GTK_IS_PIXMAP(child->data)) @@ -495,7 +500,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) */ } } @@ -528,7 +533,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) ) @@ -570,7 +575,7 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) bool wxNotebook::DeleteAllPages() { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); while (m_pagesData.GetCount() > 0) DeletePage( m_pagesData.GetCount()-1 ); @@ -600,13 +605,14 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) // 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 ); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) gtk_notebook_page_change_callback, + this); gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK (gtk_notebook_page_change_callback), this); wxGtkNotebookPage* p = GetNotebookPage(page); m_pagesData.DeleteObject(p); @@ -621,12 +627,12 @@ bool wxNotebook::InsertPage( size_t position, bool select, int imageId ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); - wxCHECK_MSG( win->GetParent() == this, FALSE, + wxCHECK_MSG( win->GetParent() == this, false, wxT("Can't add a page whose parent is not the notebook!") ); - wxCHECK_MSG( position <= GetPageCount(), FALSE, + wxCHECK_MSG( position <= GetPageCount(), false, _T("invalid page index in wxNotebookPage::InsertPage()") ); // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback @@ -637,11 +643,12 @@ bool wxNotebook::InsertPage( size_t position, win->m_widget->parent = 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 ); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) gtk_notebook_page_change_callback, + this); if (m_themeEnabled) - win->SetThemeEnabled(TRUE); + win->SetThemeEnabled(true); GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -657,8 +664,8 @@ bool wxNotebook::InsertPage( size_t position, nb_page->m_box = gtk_hbox_new( FALSE, 1 ); gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); - gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); + 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 ); @@ -689,7 +696,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 ); @@ -709,11 +716,11 @@ bool wxNotebook::InsertPage( size_t position, SetSelection( position ); } - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK (gtk_notebook_page_change_callback), this); InvalidateBestSize(); - return TRUE; + return true; } // helper for HitTest(): check if the point lies inside the given widget which @@ -736,17 +743,19 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const const gint y = m_widget->allocation.y; const size_t count = GetPageCount(); - for ( size_t i = 0; i < count; i++ ) + size_t i = 0; + + GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); + if (gtk_notebook_get_scrollable(notebook)) + i = g_list_position( notebook->children, notebook->first_tab ); + + for ( ; i < count; i++ ) { wxGtkNotebookPage* nb_page = GetNotebookPage(i); GtkWidget *box = nb_page->m_box; - // VZ: don't know how to find the border width in GTK+ 1.2 -#ifdef __WXGTK20__ const gint border = gtk_container_get_border_width(GTK_CONTAINER(box)); -#else // !GTK+ 2.x - const gint border = 0; -#endif + if ( IsPointInsideWidget(pt, box, x, y, border) ) { // ok, we're inside this tab -- now find out where, if needed @@ -754,7 +763,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { GtkWidget *pixmap = NULL; - GList *children = gtk_container_children(GTK_CONTAINER(box)); + GList *children = gtk_container_get_children(GTK_CONTAINER(box)); for ( GList *child = children; child; child = child->next ) { if ( GTK_IS_PIXMAP(child->data) ) @@ -769,15 +778,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; } } @@ -786,7 +795,22 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const } if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + { + *flags = wxBK_HITTEST_NOWHERE; + wxWindowBase * page = GetCurrentPage(); + if ( page ) + { + // rect origin is in notebook's parent coordinates + wxRect rect = page->GetRect(); + + // adjust it to the notebook's coordinates + wxPoint pos = GetPosition(); + rect.x -= pos.x; + rect.y -= pos.y; + if ( rect.Inside( pt ) ) + *flags |= wxBK_HITTEST_ONPAGE; + } + } return wxNOT_FOUND; } @@ -805,12 +829,12 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) { // don't set the sizes of the pages - their correct size is not yet known - wxControl::SetConstraintSizes(FALSE); + wxControl::SetConstraintSizes(false); } bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) { - return TRUE; + return true; } #endif @@ -826,7 +850,7 @@ void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) { return ((m_widget->window == window) || - (NOTEBOOK_PANEL(m_widget) == window)); + GTK_NOTEBOOK(m_widget)->event_window == window); } // static