X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa7bd1eef03eb167b7f70412f1b4ef08ad73138..c1aa5517acff9ce039adcd6502db2e88cdd886c7:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index a184447c6f..1e29e55f49 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,18 +10,27 @@ // 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" +#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" @@ -36,13 +45,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 //----------------------------------------------------------------------------- @@ -89,7 +91,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? @@ -169,7 +171,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 +180,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 +188,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,7 +220,7 @@ 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 ); g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; @@ -383,13 +386,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 +425,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 ) @@ -441,7 +444,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text ) 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; } @@ -475,7 +478,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)) @@ -691,7 +694,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 = wxT(""); 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 ); @@ -741,7 +744,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const size_t i = 0; GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); - if (gtk_notebook_get_scrollable(notebook)); + if (gtk_notebook_get_scrollable(notebook)) i = g_list_position( notebook->children, notebook->first_tab ); for ( ; i < count; i++ ) @@ -758,7 +761,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) )