Use temp directory and don't prepend two backslashes, on WinCE

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 54a4ebb1cb6cc7e1fa9ba0444434bdb3e3947ddc..d9ea1aa400a9a5fe5668eeece5901beca137c58c 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -22,6 +22,12 @@
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 
 #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"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 


@@ -79,7 +85,7 @@ public:
 
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGtkNotebookPagesList);
+WX_DEFINE_LIST(wxGtkNotebookPagesList)

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -89,7 +95,7 @@ WX_DEFINE_LIST(wxGtkNotebookPagesList);
 extern "C" {
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
 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?
                                               wxNotebook *notebook )
 {
     // are you trying to call SetSelection() from a notebook event handler?


@@ -111,8 +117,8 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
          !eventChanging.IsAllowed() )
     {
         /* program doesn't allow the page change */
          !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
     {
     }
     else // change allowed
     {


@@ -169,7 +175,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint
+static void

 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)


@@ -178,8 +184,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 );
     /* 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 +192,10 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 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();
 {
     if (g_isIdle)
         wxapp_install_idle_handler();


@@ -217,9 +224,9 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
         }
 
         // m_selection = page;
         }
 
         // 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;
     }
 
         return TRUE;
     }
 


@@ -247,7 +254,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
              client->SetFocus();
         }
 
              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;
     }
 
         return TRUE;
     }
 


@@ -334,25 +341,25 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
     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 );
 
 
     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 );
         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 );
         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_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);
 
 
     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;
 }


@@ -422,7 +429,7 @@ int wxNotebook::SetSelection( size_t page )
 
     // cache the selection
     m_selection = 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 )
 
     wxNotebookPage *client = GetPage(page);
     if ( client )


@@ -441,7 +448,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
 
     nb_page->m_text = 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;
 }
 
     return TRUE;
 }


@@ -475,7 +482,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 */
 
     {
         /* 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))
         while (child)
         {
             if (GTK_IS_PIXMAP(child->data))


@@ -600,13 +607,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_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_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);
 
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);


@@ -637,8 +645,9 @@ bool wxNotebook::InsertPage( size_t position,
     win->m_widget->parent = NULL;
 
     // don't receive switch page during addition
     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);
 
     if (m_themeEnabled)
         win->SetThemeEnabled(TRUE);


@@ -657,8 +666,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 );
 
     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 );
 
 
     gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
 


@@ -709,8 +718,8 @@ bool wxNotebook::InsertPage( size_t position,
       SetSelection( 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;
 
     InvalidateBestSize();
     return TRUE;


@@ -736,17 +745,19 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     const gint y = m_widget->allocation.y;
 
     const size_t count = GetPageCount();
     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;
 
     {
         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));
         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
         if ( IsPointInsideWidget(pt, box, x, y, border) )
         {
             // ok, we're inside this tab -- now find out where, if needed


@@ -754,7 +765,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
             {
                 GtkWidget *pixmap = NULL;
 
             {
                 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) )
                 for ( GList *child = children; child; child = child->next )
                 {
                     if ( GTK_IS_PIXMAP(child->data) )


@@ -826,7 +837,7 @@ void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 {
     return ((m_widget->window == window) ||
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 {
     return ((m_widget->window == window) ||

-            (NOTEBOOK_PANEL(m_widget) == window));
+            GTK_NOTEBOOK(m_widget)->event_window == window);

 }
 
 // static
 }
 
 // static