Updating with Vadim's API changes.

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index c074dcb480ba713f21abbdc538802a8f067823a6..bf86abbf3bea6534377516ed4d7b0e723e554438 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -18,20 +18,13 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

-    #include "wx/panel.h"

     #include "wx/msgdlg.h"
     #include "wx/msgdlg.h"

+    #include "wx/bitmap.h"

 #endif
 
 #include "wx/imaglist.h"
 #endif
 
 #include "wx/imaglist.h"

-#include "wx/bitmap.h"

 #include "wx/fontutil.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"
 


@@ -88,47 +81,34 @@ WX_DEFINE_LIST(wxGtkNotebookPagesList)
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
-                                              GtkNotebookPage *WXUNUSED(page),
-                                              guint page,
-                                              wxNotebook *notebook )
+static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
+                                                 GtkNotebookPage *WXUNUSED(gpage),
+                                                 guint page,
+                                                 wxNotebook *notebook )

 {
 {

-    // 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") );
-
-    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 );
+    int old = gtk_notebook_get_current_page( widget );

 
 

-    if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) &&
-         !eventChanging.IsAllowed() )
+    if ( !notebook->SendPageChangingEvent(page) )

     {
     {

-        /* program doesn't allow the page change */
-        g_signal_stop_emission_by_name (notebook->m_widget,
-                                        "switch_page");
+        // program doesn't allow the page change
+        g_signal_stop_emission_by_name(notebook->m_widget, "switch_page");

     }
     }

-    else // change allowed
+    else

     {
     {

-        // make wxNotebook::GetSelection() return the correct (i.e. consistent
-        // with wxNotebookEvent::GetSelection()) value even though the page is
-        // not really changed in GTK+
-        notebook->m_selection = page;
-
-        wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                                      notebook->GetId(), page, old );
-        eventChanged.SetEventObject( notebook );
-        notebook->GetEventHandler()->ProcessEvent( eventChanged );
+        // the page change event also reports the old page
+        notebook->m_oldSelection = old;

     }
     }

+}
+}

 
 

-    notebook->m_inSwitchPage = false;
+extern "C" {
+static void gtk_notebook_page_changed_callback( GtkNotebook *widget,
+                                                GtkNotebookPage *WXUNUSED(gpage),
+                                                guint page,
+                                                wxNotebook *notebook )
+{
+    int old = notebook->m_oldSelection;
+    notebook->SendPageChangedEvent( old );

 }
 }
 
 }
 }
 


@@ -192,8 +172,7 @@ gtk_notebook_key_press_callback( GtkWidget   *widget,
                                  GdkEventKey *gdk_event,
                                  wxNotebook  *notebook )
 {
                                  GdkEventKey *gdk_event,
                                  wxNotebook  *notebook )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal

 
     if (!notebook->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 
     if (!notebook->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;


@@ -218,10 +197,8 @@ gtk_notebook_key_press_callback( GtkWidget   *widget,
             return FALSE;
         }
 
             return FALSE;
         }
 

-        // m_selection = page;

         gtk_notebook_set_current_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;
     }
 
         return TRUE;
     }
 


@@ -249,7 +226,6 @@ gtk_notebook_key_press_callback( GtkWidget   *widget,
              client->SetFocus();
         }
 
              client->SetFocus();
         }
 

-        g_signal_stop_emission_by_name (widget, "key_press_event");

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -291,10 +267,9 @@ END_EVENT_TABLE()
 void wxNotebook::Init()
 {
     m_padding = 0;
 void wxNotebook::Init()
 {
     m_padding = 0;

-    m_inSwitchPage = false;

 
     m_imageList = (wxImageList *) NULL;
 
     m_imageList = (wxImageList *) NULL;

-    m_selection = -1;
+    m_oldSelection = -1;

     m_themeEnabled = true;
 }
 
     m_themeEnabled = true;
 }
 


@@ -324,6 +299,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     m_acceptsFocus = true;
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     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 ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {


@@ -337,7 +315,10 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     g_signal_connect (m_widget, "switch_page",
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     g_signal_connect (m_widget, "switch_page",

-                      G_CALLBACK (gtk_notebook_page_change_callback), this);
+                      G_CALLBACK (gtk_notebook_page_changing_callback), this);
+
+    g_signal_connect_after (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_changed_callback), this);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -363,24 +344,7 @@ int wxNotebook::GetSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 

-    if ( m_selection == -1 )
-    {
-        GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
-
-        if (g_list_length(nb_pages) != 0)
-        {
-            GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-
-            gpointer cur = notebook->cur_page;
-            if ( cur != NULL )
-            {
-                wxConstCast(this, wxNotebook)->m_selection =
-                    g_list_index( nb_pages, cur );
-            }
-        }
-    }
-
-    return m_selection;
+    return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );

 }
 
 wxString wxNotebook::GetPageText( size_t page ) const
 }
 
 wxString wxNotebook::GetPageText( size_t page ) const


@@ -414,7 +378,7 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
     return m_pagesData.Item(page)->GetData();
 }
 
     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, -1, wxT("invalid notebook") );
 


@@ -422,10 +386,30 @@ int wxNotebook::SetSelection( size_t page )
 
     int selOld = GetSelection();
 
 
     int selOld = GetSelection();
 

-    // cache the selection
-    m_selection = page;
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_disconnect_by_func (m_widget,
+                                             (gpointer) gtk_notebook_page_changing_callback,
+                                             this);
+
+        g_signal_handlers_disconnect_by_func (m_widget,
+                                             (gpointer) gtk_notebook_page_changed_callback,
+                                             this);
+    }
+

     gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
 
     gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
 

+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        // reconnect to signals
+        
+        g_signal_connect (m_widget, "switch_page",
+                          G_CALLBACK (gtk_notebook_page_changing_callback), this);
+
+        g_signal_connect_after (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_changed_callback), this);
+    }
+

     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();
     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();


@@ -480,7 +464,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
         GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box));
         while (child)
         {
         GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box));
         while (child)
         {

-            if (GTK_IS_PIXMAP(child->data))
+            if (GTK_IS_IMAGE(child->data))

             {
                 pixmapwid = GTK_WIDGET(child->data);
                 break;
             {
                 pixmapwid = GTK_WIDGET(child->data);
                 break;


@@ -506,17 +490,11 @@ bool wxNotebook::SetPageImage( size_t page, int image )
 
     /* Construct the new pixmap */
     const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
 
     /* Construct the new pixmap */
     const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);

-    GdkPixmap *pixmap = bmp->GetPixmap();
-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    if ( bmp->GetMask() )
-    {
-        mask = bmp->GetMask()->GetBitmap();
-    }

 
     if (pixmapwid == NULL)
     {
         /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
 
     if (pixmapwid == NULL)
     {
         /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */

-        pixmapwid = gtk_pixmap_new (pixmap, mask );
+        pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());

 
         /* CHECKME: Are these pack flags okay? */
         gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
 
         /* CHECKME: Are these pack flags okay? */
         gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);


@@ -525,7 +503,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     else
     {
         /* Case 4) Simply replace the pixmap */
     else
     {
         /* Case 4) Simply replace the pixmap */

-        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+        gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf());

     }
 
     nb_page->m_image = image;
     }
 
     nb_page->m_image = image;


@@ -585,32 +563,18 @@ bool wxNotebook::DeleteAllPages()
 
 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
 
 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {

-    if ( m_selection != -1 && (size_t)m_selection >= page )
-    {
-        // the index will become invalid after the page is deleted
-        m_selection = -1;
-    }
-

     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;
 
     gtk_widget_ref( client->m_widget );
     gtk_widget_unrealize( client->m_widget );
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;
 
     gtk_widget_ref( client->m_widget );
     gtk_widget_unrealize( client->m_widget );

-    gtk_widget_unparent( client->m_widget );

 
 

-    // 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
-    g_signal_handlers_disconnect_by_func (m_widget,
-                                          (gpointer) gtk_notebook_page_change_callback,
-                                          this);
+    // we don't need to unparent the client->m_widget; GTK+ will do
+    // that for us (and will throw a warning if we do it!)

 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 

-    g_signal_connect (m_widget, "switch_page",
-                      G_CALLBACK (gtk_notebook_page_change_callback), this);
-

     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;


@@ -639,11 +603,6 @@ bool wxNotebook::InsertPage( size_t position,
     // hand here.
     win->m_widget->parent = NULL;
 
     // hand here.
     win->m_widget->parent = NULL;
 

-    // don't receive switch page during addition
-    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);
 


@@ -659,7 +618,7 @@ bool wxNotebook::InsertPage( size_t position,
     m_pages.Insert(win, position);
 
     nb_page->m_box = gtk_hbox_new( FALSE, 1 );
     m_pages.Insert(win, position);
 
     nb_page->m_box = gtk_hbox_new( FALSE, 1 );

-    gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 );
+    gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2);

 
     g_signal_connect (win->m_widget, "size_allocate",
                       G_CALLBACK (gtk_page_size_callback), win);
 
     g_signal_connect (win->m_widget, "size_allocate",
                       G_CALLBACK (gtk_page_size_callback), win);


@@ -676,23 +635,14 @@ bool wxNotebook::InsertPage( size_t position,
         wxASSERT( m_imageList != NULL );
 
         const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
         wxASSERT( m_imageList != NULL );
 
         const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);

-        GdkPixmap *pixmap = bmp->GetPixmap();
-        GdkBitmap *mask = (GdkBitmap*) NULL;
-        if ( bmp->GetMask() )
-        {
-            mask = bmp->GetMask()->GetBitmap();
-        }
-
-        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
-
+        GtkWidget* pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());

         gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
         gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);

-

         gtk_widget_show(pixmapwid);
     }
 
     /* set the label text */
 
         gtk_widget_show(pixmapwid);
     }
 
     /* set the label text */
 

-    nb_page->m_text = text;
+    nb_page->m_text = wxStripMenuCodes(text);

     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)) );
     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)) );


@@ -708,14 +658,12 @@ bool wxNotebook::InsertPage( size_t position,
 
     /* show the label */
     gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
 
     /* show the label */
     gtk_widget_show( GTK_WIDGET(nb_page->m_label) );

+    

     if (select && (m_pagesData.GetCount() > 1))
     {
     if (select && (m_pagesData.GetCount() > 1))
     {

-      SetSelection( position );
+        SetSelection( position );

     }
 
     }
 

-    g_signal_connect (m_widget, "switch_page",
-                      G_CALLBACK (gtk_notebook_page_change_callback), this);
-

     InvalidateBestSize();
     return true;
 }
     InvalidateBestSize();
     return true;
 }


@@ -763,7 +711,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
                 GList *children = gtk_container_get_children(GTK_CONTAINER(box));
                 for ( GList *child = children; child; child = child->next )
                 {
                 GList *children = gtk_container_get_children(GTK_CONTAINER(box));
                 for ( GList *child = children; child; child = child->next )
                 {

-                    if ( GTK_IS_PIXMAP(child->data) )
+                    if (GTK_IS_IMAGE(child->data))

                     {
                         pixmap = GTK_WIDGET(child->data);
                         break;
                     {
                         pixmap = GTK_WIDGET(child->data);
                         break;


@@ -775,15 +723,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 
                 if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
                 {
 
                 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) )
                 {
                 }
                 else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
                 {

-                    *flags = wxNB_HITTEST_ONLABEL;
+                    *flags = wxBK_HITTEST_ONLABEL;

                 }
                 else
                 {
                 }
                 else
                 {

-                    *flags = wxNB_HITTEST_ONITEM;
+                    *flags = wxBK_HITTEST_ONITEM;

                 }
             }
 
                 }
             }
 


@@ -792,7 +740,22 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     }
 
     if ( flags )
     }
 
     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.Contains( pt ) )
+                *flags |= wxBK_HITTEST_ONPAGE;
+        }
+    }

 
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }


@@ -829,10 +792,12 @@ void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
         gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style);
 }
 
         gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style);
 }
 

-bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    return ((m_widget->window == window) ||
-            GTK_NOTEBOOK(m_widget)->event_window == window);
+    windows.push_back(m_widget->window);
+    windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
+
+    return NULL;

 }
 
 // static
 }
 
 // static