Modified Files: gtkclist.c gtkclist.h gtkctree.c gtkctree.h gtknotebook.c

 Modified Files:
 	gtkclist.c gtkclist.h gtkctree.c gtkctree.h gtknotebook.c
 	gtknotebook.h gtkrc.c gtkrc.h
 add const in some useful places

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index cca25b8fc6ef95bf4362174c7688d7e9dadb371c..c363421664bd1a1b48ebd0da55fb0db3ccece466 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -937,7 +937,7 @@ gtk_clist_init (GtkCList *clist)
 void
 gtk_clist_construct (GtkCList *clist,
                     gint      columns,
-                    gchar    *titles[])
+                    const gchar *titles[])
 {
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
@@ -1008,7 +1008,7 @@ gtk_clist_new (gint columns)
  
 GtkWidget*
 gtk_clist_new_with_titles (gint   columns,
-                          gchar *titles[])
+                          const gchar *titles[])
 {
   GtkWidget *widget;
 
@@ -2522,8 +2522,8 @@ cell_size_request (GtkCList       *clist,
  *   gtk_clist_clear
  */
 gint
-gtk_clist_prepend (GtkCList *clist,
-                  gchar    *text[])
+gtk_clist_prepend (GtkCList    *clist,
+                  const gchar *text[])
 {
   g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
@@ -2533,8 +2533,8 @@ gtk_clist_prepend (GtkCList *clist,
 }
 
 gint
-gtk_clist_append (GtkCList *clist,
-                 gchar    *text[])
+gtk_clist_append (GtkCList    *clist,
+                 const gchar *text[])
 {
   g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
@@ -2544,9 +2544,9 @@ gtk_clist_append (GtkCList *clist,
 }
 
 gint
-gtk_clist_insert (GtkCList *clist,
-                 gint      row,
-                 gchar    *text[])
+gtk_clist_insert (GtkCList    *clist,
+                 gint         row,
+                 const gchar *text[])
 {
   g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 5ca8f5af2fb59e13b4e83fab1fe115413f97a57f..2323b3481bb2ff17239fde8bc1114086a9001e44 100644 (file)
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -378,12 +378,12 @@ GtkType gtk_clist_get_type (void);
 /* constructors useful for gtk-- wrappers */
 void gtk_clist_construct (GtkCList *clist,
                          gint      columns,
-                         gchar    *titles[]);
+                         const gchar *titles[]);
 
 /* create a new GtkCList */
 GtkWidget* gtk_clist_new             (gint   columns);
 GtkWidget* gtk_clist_new_with_titles (gint   columns,
-                                     gchar *titles[]);
+                                     const gchar *titles[]);
 
 /* set adjustments of clist */
 void gtk_clist_set_hadjustment (GtkCList      *clist,
@@ -604,17 +604,17 @@ gboolean gtk_clist_get_selectable (GtkCList *clist,
 /* prepend/append returns the index of the row you just added,
  * making it easier to append and modify a row
  */
-gint gtk_clist_prepend (GtkCList *clist,
-                       gchar    *text[]);
-gint gtk_clist_append  (GtkCList *clist,
-                       gchar    *text[]);
+gint gtk_clist_prepend (GtkCList    *clist,
+                       const gchar *text[]);
+gint gtk_clist_append  (GtkCList    *clist,
+                       const gchar *text[]);
 
 /* inserts a row at index row and returns the row where it was
  * actually inserted (may be different from "row" in auto_sort mode)
  */
-gint gtk_clist_insert (GtkCList *clist,
-                      gint      row,
-                      gchar    *text[]);
+gint gtk_clist_insert (GtkCList    *clist,
+                      gint         row,
+                      const gchar *text[]);
 
 /* removes row at index row */
 void gtk_clist_remove (GtkCList *clist,

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 3e824de29d46171f887097b5d781f40341d87666..9934a58c3dca4846397d3f39f1606522e63bf2f0 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -3880,10 +3880,10 @@ ctree_is_hot_spot (GtkCTree     *ctree,
  ***********************************************************/
 
 void
-gtk_ctree_construct (GtkCTree *ctree,
-                    gint      columns, 
-                    gint      tree_column,
-                    gchar    *titles[])
+gtk_ctree_construct (GtkCTree    *ctree,
+                    gint         columns, 
+                    gint         tree_column,
+                    const gchar *titles[])
 {
   GtkCList *clist;
 
@@ -3911,9 +3911,9 @@ gtk_ctree_construct (GtkCTree *ctree,
 }
 
 GtkWidget *
-gtk_ctree_new_with_titles (gint   columns, 
-                          gint   tree_column,
-                          gchar *titles[])
+gtk_ctree_new_with_titles (gint         columns, 
+                          gint         tree_column,
+                          const gchar *titles[])
 {
   GtkWidget *widget;
 

diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 141316a14d2f86b6a88e2e019ddc626b9e186871..0abc075b3bd8cc5bf4131186301d716fa34b8d97 100644 (file)
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -177,10 +177,10 @@ GtkType gtk_ctree_get_type                       (void);
 void gtk_ctree_construct                         (GtkCTree     *ctree,
                                                  gint          columns, 
                                                  gint          tree_column,
-                                                 gchar        *titles[]);
+                                                 const gchar  *titles[]);
 GtkWidget * gtk_ctree_new_with_titles            (gint          columns, 
                                                  gint          tree_column,
-                                                 gchar        *titles[]);
+                                                 const gchar  *titles[]);
 GtkWidget * gtk_ctree_new                        (gint          columns, 
                                                  gint          tree_column);
 GtkCTreeNode * gtk_ctree_insert_node             (GtkCTree     *ctree,

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ee637473c720c908d0643fd28771064165a0596f..a0496545984a6bdfb806c01f56e2d40a438ccc91 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3925,7 +3925,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
 void
 gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
                                 GtkWidget   *child,
-                                gchar       *tab_text)
+                                const gchar *tab_text)
 {
   GtkWidget *tab_label = NULL;
 
@@ -4000,7 +4000,7 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook,
 void
 gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
                                  GtkWidget   *child,
-                                 gchar       *menu_text)
+                                 const gchar *menu_text)
 {
   GtkWidget *menu_label = NULL;
 

diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 5531722d2b5a388e3c8c6e8988506629c6d15493..7c0c149a8736ca91e323215b5d0582d58de5aec2 100644 (file)
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -179,7 +179,7 @@ void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
                                           GtkWidget   *tab_label);
 void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
                                           GtkWidget   *child,
-                                          gchar       *tab_text);
+                                          const gchar *tab_text);
 GtkWidget * gtk_notebook_query_menu_label (GtkNotebook *notebook,
                                           GtkWidget   *child);
 void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
@@ -187,7 +187,7 @@ void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
                                           GtkWidget   *menu_label);
 void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
                                           GtkWidget   *child,
-                                          gchar       *menu_text);
+                                          const gchar *menu_text);
 void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gboolean    *expand,

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 59dc6f4817892a115fdc4f978dd98ae26e8bec08..23f2f2b39bb72c75c0ccbb3be0c49ffcad23977a 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1359,7 +1359,7 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
 
 gchar*
 gtk_rc_find_pixmap_in_path (GScanner *scanner,
-                           gchar    *pixmap_file)
+                           const gchar *pixmap_file)
 {
   gint i;
   gint fd;
@@ -1392,7 +1392,7 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner,
 
 gchar*
 gtk_rc_find_module_in_path (GScanner *scanner,
-                           gchar    *module_file)
+                           const gchar *module_file)
 {
   gint i;
   gint fd;

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 8600f2138e2d04ae72d16879d7a505f2d294ea3b..53e3188b57e80efab7d0127a9554b8f9c7d4dd6d 100644 (file)
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -83,10 +83,10 @@ void          gtk_rc_set_image_loader(GtkImageLoader loader);
 GdkPixmap *gtk_rc_load_image (GdkColormap *colormap,
                              GdkColor    *transparent_color,
                              const gchar *filename);
-gchar      *gtk_rc_find_pixmap_in_path (GScanner *scanner,
-                                       gchar    *pixmap_file);
+gchar      *gtk_rc_find_pixmap_in_path (GScanner    *scanner,
+                                       const gchar *pixmap_file);
 gchar      *gtk_rc_find_module_in_path (GScanner *scanner,
-                                       gchar    *module_file);
+                                       const gchar *module_file);
 gchar      *gtk_rc_get_theme_dir(void);
 gchar      *gtk_rc_get_module_dir(void);