Revert inclusion of wx/dateevt.h for now, as it breaks linkage

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 9cc15b8a051ec77fe02b2d0c052387f4d2027da9..329ecddec58827a5b6393c0006f630f88427c3cb 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -22,6 +22,12 @@
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 
+// FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
@@ -111,8 +117,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
     {
@@ -217,9 +223,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 +253,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;
     }
 
@@ -334,8 +340,8 @@ 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 );
 
@@ -346,13 +352,13 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     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;
 }
@@ -422,7 +428,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 +447,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 +481,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))
@@ -600,13 +606,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);
@@ -637,8 +644,9 @@ 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);
@@ -657,8 +665,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 );
 
@@ -709,8 +717,8 @@ 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;
@@ -756,7 +764,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) )
@@ -828,7 +836,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