WXDLLEXPORT fixes

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 9bd054e96fc35e49459981bbce65794698e57546..c3dd7241a1f4c8cf857dfe36a8023cb61668ff81 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -74,8 +74,6 @@ public:
         m_box = (GtkWidget *) NULL;
     }
     
         m_box = (GtkWidget *) NULL;
     }
     

-    bool SetFont(const wxFont& font);
-

     wxString           m_text;
     int                m_image;
     GtkNotebookPage   *m_page;
     wxString           m_text;
     int                m_image;
     GtkNotebookPage   *m_page;


@@ -84,26 +82,6 @@ public:
 };
 
 
 };
 
 

-bool wxGtkNotebookPage::SetFont(const wxFont& font)
-{
-    if (!m_label)
-               return false;
-
-#ifdef __WXGTK20__
-    gtk_widget_modify_font(GTK_WIDGET(m_label),
-                           font.GetNativeFontInfo()->description);
-#else
-    GtkRcStyle *style = gtk_rc_style_new();
-    style->fontset_name = 
-        g_strdup(font.GetNativeFontInfo()->GetXFontName().c_str());
-    gtk_widget_modify_style(GTK_WIDGET(m_label), style);
-    gtk_rc_style_unref(style);
-#endif
-
-       return true;
-}
-
-

 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGtkNotebookPagesList);
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGtkNotebookPagesList);
 


@@ -251,12 +229,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.

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


@@ -612,8 +597,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


@@ -680,6 +668,14 @@ bool wxNotebook::InsertPage( size_t position,
     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 );
 
     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 );
 

+    /* 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))


@@ -801,8 +797,10 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 
 void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    // TODO, font for labels etc
-    gtk_widget_modify_style( m_widget, style );
+    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 )


@@ -811,19 +809,6 @@ bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 

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

 // static
 wxVisualAttributes
 wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))