add _gtk_tree_view_column_get_editable_cell and

[~andy/gtk] / gtk / gtkcolorseldialog.c

diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 4c32b7b213db2abbe160be69c29989585b165e6d..aa010b02d28af4ee5caf061878b3dca0e3b522b2 100644 (file)
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -2,16 +2,16 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
@@ -28,6 +28,8 @@
 #include "gtkframe.h"
 #include "gtkhbbox.h"
 #include "gtkbutton.h"
+#include "gtkstock.h"
+#include "gtkintl.h"
 
 
 static void gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass);
@@ -78,13 +80,7 @@ gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
 static void
 gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
 {
-  GtkWidget *action_area_button_box, *frame;
-  
-  gtk_widget_set_visual (GTK_WIDGET (colorseldiag), gdk_rgb_get_visual ());
-  gtk_widget_set_colormap (GTK_WIDGET (colorseldiag), gdk_rgb_get_cmap ());
-  
-  gtk_widget_push_visual (gdk_rgb_get_visual ());
-  gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+  GtkWidget *action_area_button_box, *frame;  
   
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
@@ -93,35 +89,28 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   gtk_widget_show (frame); 
   
   colorseldiag->colorsel = gtk_color_selection_new ();
-  gtk_color_selection_set_use_palette (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE); 
-  gtk_color_selection_set_use_opacity (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE);
+  gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE); 
+  gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION(colorseldiag->colorsel), FALSE);
   gtk_container_add (GTK_CONTAINER (frame), colorseldiag->colorsel);
   gtk_widget_show (colorseldiag->colorsel);
   
-  action_area_button_box = gtk_hbutton_box_new ();
-  gtk_button_box_set_layout (GTK_BUTTON_BOX(action_area_button_box), GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing (GTK_BUTTON_BOX(action_area_button_box), 5);
-  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (colorseldiag)->action_area), action_area_button_box, TRUE, TRUE, 0);
-  gtk_widget_show (action_area_button_box);
-  
-  colorseldiag->ok_button = gtk_button_new_with_label (_("OK"));
-  GTK_WIDGET_SET_FLAGS (colorseldiag->ok_button, GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (action_area_button_box), colorseldiag->ok_button, TRUE, TRUE, 0);
+  action_area_button_box = GTK_DIALOG (colorseldiag)->action_area;
+
+  colorseldiag->cancel_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
+                                                       GTK_STOCK_CANCEL,
+                                                       GTK_RESPONSE_CANCEL);
+
+  colorseldiag->ok_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
+                                                   GTK_STOCK_OK,
+                                                   GTK_RESPONSE_OK);
+                                                   
   gtk_widget_grab_default (colorseldiag->ok_button);
-  gtk_widget_show (colorseldiag->ok_button);
-  
-  colorseldiag->cancel_button = gtk_button_new_with_label (_("Cancel"));
-  GTK_WIDGET_SET_FLAGS (colorseldiag->cancel_button, GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (action_area_button_box), colorseldiag->cancel_button, TRUE, TRUE, 0);
-  gtk_widget_show (colorseldiag->cancel_button);
   
-  colorseldiag->help_button = gtk_button_new_with_label (_("Help"));
-  GTK_WIDGET_SET_FLAGS (colorseldiag->help_button, GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (action_area_button_box), colorseldiag->help_button, TRUE, TRUE, 0);
-  gtk_widget_show (colorseldiag->help_button);
-  
-  gtk_widget_pop_colormap ();
-  gtk_widget_pop_visual ();
+  colorseldiag->help_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
+                                                     GTK_STOCK_HELP,
+                                                     GTK_RESPONSE_HELP);
+
+  gtk_widget_hide (colorseldiag->help_button);
 }
 
 GtkWidget*