Applied patch [ 1369264 ] added note for wxListCtrl::OnGetItemAttr( long item)

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 25edf2c1105058f75d15fe9c82dcc7659dc1b4b7..fa18809974dab424a65ec6d29ac17cce7122de21 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -72,79 +68,25 @@ public:
         m_image = -1;
         m_page = (GtkNotebookPage *) NULL;
         m_box = (GtkWidget *) NULL;
         m_image = -1;
         m_page = (GtkNotebookPage *) NULL;
         m_box = (GtkWidget *) NULL;

-        m_labelStyle = (GtkStyle*) NULL;
-    }
-    
-    ~wxGtkNotebookPage()
-    {
-        if (m_labelStyle)
-            gtk_style_unref( m_labelStyle );

     }
     }

-    
-    bool SetFont(const wxFont& font);

 
     wxString           m_text;
     int                m_image;
     GtkNotebookPage   *m_page;
     GtkLabel          *m_label;
     GtkWidget         *m_box;     // in which the label and image are packed
 
     wxString           m_text;
     int                m_image;
     GtkNotebookPage   *m_page;
     GtkLabel          *m_label;
     GtkWidget         *m_box;     // in which the label and image are packed

-    GtkStyle          *m_labelStyle;

 };
 
 
 };
 
 

-bool wxGtkNotebookPage::SetFont(const wxFont& font)
-{
-    if (!m_label)
-               return false;
-
-    if (m_labelStyle)
-    {
-        GtkStyle *remake = gtk_style_copy( m_labelStyle );
-
-#ifndef __WXGTK20__
-        remake->klass = m_labelStyle->klass;
-#endif
-
-        gtk_style_unref( m_labelStyle );
-        m_labelStyle = remake;
-    }
-    else
-    {
-        GtkStyle *def = gtk_rc_get_style( GTK_WIDGET(m_label) );
-
-        if (!def)
-            def = gtk_widget_get_default_style();
-
-        m_labelStyle = gtk_style_copy( def );
-
-        // FIXME: no more klass in 2.0
-#ifndef __WXGTK20__
-        m_labelStyle->klass = def->klass;
-#endif
-    }
-
-#ifdef __WXGTK20__
-       pango_font_description_free( m_labelStyle->font_desc );
-       m_labelStyle->font_desc = pango_font_description_copy( font.GetNativeFontInfo()->description );
-#else
-       gdk_font_unref( m_labelStyle->font );
-       m_labelStyle->font = gdk_font_ref( font.GetInternalFont( 1.0 ) );
-#endif
-
-    gtk_widget_set_style( GTK_WIDGET(m_label), m_labelStyle );
-
-       return true;
-}
-
-

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGtkNotebookPagesList);
+WX_DEFINE_LIST(wxGtkNotebookPagesList)

 
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 
 
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint page,
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint page,


@@ -187,11 +129,13 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 
     notebook->m_inSwitchPage = FALSE;
 }
 
     notebook->m_inSwitchPage = FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle)
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle)


@@ -218,11 +162,13 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
         gtk_widget_size_allocate( win->m_wxwindow, alloc );
     }
 }
         gtk_widget_size_allocate( win->m_wxwindow, alloc );
     }
 }

+}

 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {


@@ -235,37 +181,67 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

-static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
+extern "C" {
+static gint 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();
 

-    if (!win->m_hasVMT) return FALSE;
+    if (!notebook->m_hasVMT) return FALSE;

     if (g_blockEventsOnDrag) return FALSE;
 
     if (g_blockEventsOnDrag) return FALSE;
 

+    /* win is a control: tab can be propagated up */
+    if ((gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right))
+    {
+        int page;
+        int nMax = notebook->GetPageCount();
+        if ( nMax-- ) // decrement it to get the last valid index
+        {
+            int nSel = notebook->GetSelection();
+
+            // change selection wrapping if it becomes invalid
+            page = (gdk_event->keyval != GDK_Left) ? nSel == nMax ? 0
+                                       : nSel + 1
+                        : nSel == 0 ? nMax
+                                    : nSel - 1;
+        }
+        else // notebook is empty, no next page
+        {
+            return FALSE;
+        }
+
+        // m_selection = page;
+        gtk_notebook_set_page( GTK_NOTEBOOK(widget), page );
+
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+

     /* win is a control: tab can be propagated up */
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
     /* win is a control: tab can be propagated up */
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {

-        int sel = win->GetSelection();
+        int sel = notebook->GetSelection();

         if (sel == -1)
             return TRUE;
         if (sel == -1)
             return TRUE;

-        wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel);
+        wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);

         wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
 
         wxNavigationKeyEvent event;
         wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
 
         wxNavigationKeyEvent event;

-        event.SetEventObject( win );
+        event.SetEventObject( notebook );

         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */

-        event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
-        event.SetCurrentFocus( win );
+        event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ||
+                               (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) );
+        event.SetCurrentFocus( notebook );

 
 

-        wxNotebookPage *client = win->GetPage(sel);
+        wxNotebookPage *client = notebook->GetPage(sel);

         if ( !client->GetEventHandler()->ProcessEvent( event ) )
         {
              client->SetFocus();
         if ( !client->GetEventHandler()->ProcessEvent( event ) )
         {
              client->SetFocus();


@@ -277,6 +253,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook


@@ -284,12 +261,19 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
 
 static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 {
 
 static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 {

-    // Hack alert! We manually set the child window
-    // parent field so that GTK can query the 
-    // notebook's style and font. Without that, GetBestSize could return
-    // incorrect size, see bug #901694 for details
+    // Hack Alert! (Part I): This sets the notebook as the parent of the child
+    // widget, and takes care of some details such as updating the state and
+    // style of the child to reflect its new location.  We do this early
+    // because without it GetBestSize (which is used to set the initial size
+    // of controls if an explicit size is not given) will often report
+    // incorrect sizes since the widget's style context is not fully known.
+    // See bug #901694 for details

     // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)
     // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)

-    child->m_widget->parent = parent->m_widget;
+    gtk_widget_set_parent(child->m_widget, parent->m_widget);
+
+    // NOTE: This should be considered a temporary workaround until we can
+    // work out the details and implement delaying the setting of the initial
+    // size of widgets until the size is really needed.

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -355,11 +339,11 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     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_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",


@@ -367,8 +351,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    SetFont( parent->GetFont() );
-

     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 


@@ -521,7 +503,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     wxASSERT( m_imageList != NULL ); /* Just in case */
 
     /* Construct the new pixmap */
     wxASSERT( m_imageList != NULL ); /* Just in case */
 
     /* Construct the new pixmap */

-    const wxBitmap *bmp = m_imageList->GetBitmap(image);
+    const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);

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


@@ -595,23 +577,18 @@ bool wxNotebook::DeleteAllPages()
 
     wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
 
 
     wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
 

+    InvalidateBestSize();

     return wxNotebookBase::DeleteAllPages();
 }
 
     return wxNotebookBase::DeleteAllPages();
 }
 

-bool wxNotebook::DeletePage( size_t page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )

 {
 {

-    if ( m_selection == (int)m_pagesData.GetCount() - 1 )
+    if ( m_selection != -1 && (size_t)m_selection >= page )

     {
         // the index will become invalid after the page is deleted
         m_selection = -1;
     }
 
     {
         // the index will become invalid after the page is deleted
         m_selection = -1;
     }
 

-    // it will call our DoRemovePage() to do the real work
-    return wxNotebookBase::DeletePage(page);
-}
-
-wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
-{

     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;


@@ -652,8 +629,11 @@ bool wxNotebook::InsertPage( size_t position,
     wxCHECK_MSG( position <= GetPageCount(), FALSE,
                  _T("invalid page index in wxNotebookPage::InsertPage()") );
 
     wxCHECK_MSG( position <= GetPageCount(), FALSE,
                  _T("invalid page index in wxNotebookPage::InsertPage()") );
 

-    // Hack alert part II! See above in InsertChildInNotebook
-    // callback why this has to be done.
+    // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
+    // why this has to be done.  NOTE: using gtk_widget_unparent here does not
+    // work as it seems to undo too much and will cause errors in the
+    // gtk_notebook_insert_page below, so instead just clear the parent by
+    // hand here.

     win->m_widget->parent = NULL;
 
     // don't receive switch page during addition
     win->m_widget->parent = NULL;
 
     // don't receive switch page during addition


@@ -670,7 +650,7 @@ bool wxNotebook::InsertPage( size_t position,
     if ( position == GetPageCount() )
         m_pagesData.Append( nb_page );
     else
     if ( position == GetPageCount() )
         m_pagesData.Append( nb_page );
     else

-        m_pagesData.Insert( m_pagesData.Item( position ), nb_page );
+        m_pagesData.Insert( position, nb_page );

 
     m_pages.Insert(win, position);
 
 
     m_pages.Insert(win, position);
 


@@ -680,13 +660,7 @@ bool wxNotebook::InsertPage( size_t position,
     gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
 
     gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
 

-#ifndef __VMS
-   // On VMS position is unsigned and thus always positive
-   if (position < 0)
-        gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
-    else
-#endif
-     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 );

 
     nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 
 
     nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 


@@ -697,7 +671,7 @@ bool wxNotebook::InsertPage( size_t position,
     {
         wxASSERT( m_imageList != NULL );
 
     {
         wxASSERT( m_imageList != NULL );
 

-        const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+        const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);

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


@@ -718,25 +692,27 @@ bool wxNotebook::InsertPage( size_t position,
     if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
 
     nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
     if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
 
     nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );

-       nb_page->SetFont(GetFont());

     gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
 
     gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
 

+    /* apply current style */
+    GtkRcStyle *style = CreateWidgetStyle();
+    if ( style )
+    {
+        gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style);
+        gtk_rc_style_unref(style);
+    }
+

     /* show the label */
     gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
     if (select && (m_pagesData.GetCount() > 1))
     {
     /* show the label */
     gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
     if (select && (m_pagesData.GetCount() > 1))
     {

-#ifndef __VMS
-   // On VMS position is unsigned and thus always positive
-        if (position < 0)
-            SetSelection( GetPageCount()-1 );
-        else
-#endif
-           SetSelection( position );
+      SetSelection( position );

     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 

+    InvalidateBestSize();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -760,7 +736,15 @@ 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;
+
+#ifdef __WXGTK20__
+    GtkNotebook * notebook = GTK_NOTEBOOK(m_widget);
+    if (gtk_notebook_get_scrollable(notebook));
+        i = g_list_position( notebook->children, notebook->first_tab );
+#endif
+
+    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;


@@ -839,12 +823,12 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 
 #endif
 
 
 #endif
 

-void wxNotebook::ApplyWidgetStyle()
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    // TODO, font for labels etc
-
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    size_t cnt = m_pagesData.GetCount();
+    for (size_t i = 0; i < cnt; i++)
+        gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style);

 }
 
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 }
 
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )


@@ -853,17 +837,11 @@ bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 

-bool  wxNotebook::SetFont(const wxFont& font)
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-       bool rc=wxNotebookBase::SetFont(font);
-
-       if (rc)
-       {
-               size_t i;
-               for (i=0 ; i < m_pagesData.GetCount() ; i++)
-                       GetNotebookPage(i)->SetFont(font);
-       }
-       return rc;
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------