Added wxNotebook::SetText and SetImage (thanks Harm)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/notebook.cpp

@@ -44,8 +44,11 @@ public:
     m_added = FALSE;
   }
 
-  // mark page as "added' to the notebook, return FALSE if the page was
+  /*
-  // already added
+     mark page as "added' to the notebook, return FALSE if the page was
+     already added
+   */ 
+   
   bool Add()
   {
     if ( WasAdded() )
@@ -392,15 +395,93 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 
     nb_page->m_text = text;
 
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
+ 
+    gtk_label_set(nb_page->m_label, nb_page->m_text);
+   
     return TRUE;
 }
 
 bool wxNotebook::SetPageImage( int page, int image )
 {
+    /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
+    
     wxNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
  
+    /* Optimization posibility: return immediately if image unchanged.
+     * Not enabled because it may break existing (stupid) code that
+     * manipulates the imagelist to cycle images */
+ 
+    /* if (image == nb_page->m_image) return TRUE; */
+ 
+    /* For different cases: 
+       1) no image -> no image
+       2) image -> no image
+       3) no image -> image
+       4) image -> image */
+       
+    if (image == -1 && nb_page->m_image == -1)
+        return TRUE; /* Case 1): Nothing to do. */
+ 
+    GtkWidget *pixmapwid = NULL;
+ 
+    if (nb_page->m_image != -1) 
+    {
+        /* 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));
+        while (child)
+	{
+            if (GTK_IS_PIXMAP(child->data)) 
+	    {
+ 	        pixmapwid = GTK_WIDGET(child->data);
+ 	        break;
+            }
+	    child = child->next;
+	}
+	
+        /* We should have the pixmap widget now */
+        wxASSERT(pixmapwid != NULL); 
+	
+        if (image == -1) 
+	{
+            /* If there's no new widget, just remove the old from the box */
+            gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
+            nb_page->m_image = -1;
+
+            return TRUE; /* Case 2) */
+        }
+    }
+   
+    /* Only cases 3) and 4) left */
+    wxASSERT( m_imageList != NULL ); /* Just in case */
+   
+    /* Construct the new pixmap */
+    const wxBitmap *bmp = m_imageList->GetBitmap(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 */
+        pixmapwid = gtk_pixmap_new (pixmap, mask );
+	
+        /* CHECKME: Are these pack flags okay? */
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
+        gtk_widget_show(pixmapwid);
+    }
+    else 
+    {
+        /* Case 4) Simply replace the pixmap */
+        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+    }
+    
     nb_page->m_image = image;
 
     return TRUE;
@@ -484,8 +565,8 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
 
-  // we've created the notebook page in AddChild(). Now we just have to set
+    /* we've created the notebook page in AddChild(). Now we just have to set
-  // the caption for the page and set the others parameters.
+       the caption for the page and set the others parameters. */
 
     wxNotebookPage *page = (wxNotebookPage *) NULL;
 
@@ -522,15 +603,15 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
         gtk_widget_show(pixmapwid);
     }
 
-  // then set the attributes
+    /* then set the attributes */
     page->m_text = text;
     if (page->m_text.IsEmpty()) page->m_text = "";
     page->m_image = imageId;
     page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
-  gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+    gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
 
-  // @@@: what does this do? do we still need it?
+    /* @@@: what does this do? do we still need it?
-  // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+    gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
 
     gtk_widget_show((GtkWidget *)page->m_label);
 

src/gtk1/notebook.cpp

@@ -44,8 +44,11 @@ public:
     m_added = FALSE;
   }
 
-  // mark page as "added' to the notebook, return FALSE if the page was
+  /*
-  // already added
+     mark page as "added' to the notebook, return FALSE if the page was
+     already added
+   */ 
+   
   bool Add()
   {
     if ( WasAdded() )
@@ -392,15 +395,93 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 
     nb_page->m_text = text;
 
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
+ 
+    gtk_label_set(nb_page->m_label, nb_page->m_text);
+   
     return TRUE;
 }
 
 bool wxNotebook::SetPageImage( int page, int image )
 {
+    /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
+    
     wxNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
  
+    /* Optimization posibility: return immediately if image unchanged.
+     * Not enabled because it may break existing (stupid) code that
+     * manipulates the imagelist to cycle images */
+ 
+    /* if (image == nb_page->m_image) return TRUE; */
+ 
+    /* For different cases: 
+       1) no image -> no image
+       2) image -> no image
+       3) no image -> image
+       4) image -> image */
+       
+    if (image == -1 && nb_page->m_image == -1)
+        return TRUE; /* Case 1): Nothing to do. */
+ 
+    GtkWidget *pixmapwid = NULL;
+ 
+    if (nb_page->m_image != -1) 
+    {
+        /* 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));
+        while (child)
+	{
+            if (GTK_IS_PIXMAP(child->data)) 
+	    {
+ 	        pixmapwid = GTK_WIDGET(child->data);
+ 	        break;
+            }
+	    child = child->next;
+	}
+	
+        /* We should have the pixmap widget now */
+        wxASSERT(pixmapwid != NULL); 
+	
+        if (image == -1) 
+	{
+            /* If there's no new widget, just remove the old from the box */
+            gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
+            nb_page->m_image = -1;
+
+            return TRUE; /* Case 2) */
+        }
+    }
+   
+    /* Only cases 3) and 4) left */
+    wxASSERT( m_imageList != NULL ); /* Just in case */
+   
+    /* Construct the new pixmap */
+    const wxBitmap *bmp = m_imageList->GetBitmap(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 */
+        pixmapwid = gtk_pixmap_new (pixmap, mask );
+	
+        /* CHECKME: Are these pack flags okay? */
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
+        gtk_widget_show(pixmapwid);
+    }
+    else 
+    {
+        /* Case 4) Simply replace the pixmap */
+        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+    }
+    
     nb_page->m_image = image;
 
     return TRUE;
@@ -484,8 +565,8 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
 
-  // we've created the notebook page in AddChild(). Now we just have to set
+    /* we've created the notebook page in AddChild(). Now we just have to set
-  // the caption for the page and set the others parameters.
+       the caption for the page and set the others parameters. */
 
     wxNotebookPage *page = (wxNotebookPage *) NULL;
 
@@ -522,15 +603,15 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
         gtk_widget_show(pixmapwid);
     }
 
-  // then set the attributes
+    /* then set the attributes */
     page->m_text = text;
     if (page->m_text.IsEmpty()) page->m_text = "";
     page->m_image = imageId;
     page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
-  gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+    gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
 
-  // @@@: what does this do? do we still need it?
+    /* @@@: what does this do? do we still need it?
-  // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+    gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
 
     gtk_widget_show((GtkWidget *)page->m_label);