[maemo-commits] [maemo-commits] r15627 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: berto
Date: 2008-06-04 15:06:16 +0300 (Wed, 04 Jun 2008)
New Revision: 15627

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkdialog.c
Log:
* gtk/gtkdialog.c (gtk_dialog_init): change the layout of the
dialog so the buttons appear vertically on the right side.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-06-04 11:08:15 UTC (rev 15626)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-06-04 12:06:16 UTC (rev 15627)
@@ -1,3 +1,8 @@
+2008-06-04  Alberto Garcia  <agarcia at igalia.com>
+
+	* gtk/gtkdialog.c (gtk_dialog_init): change the layout of the
+	dialog so the buttons appear vertically on the right side.
+
 2008-06-04  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): one part of

Modified: projects/haf/trunk/gtk+/gtk/gtkdialog.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkdialog.c	2008-06-04 11:08:15 UTC (rev 15626)
+++ projects/haf/trunk/gtk+/gtk/gtkdialog.c	2008-06-04 12:06:16 UTC (rev 15627)
@@ -30,9 +30,12 @@
 #include "gtkbutton.h"
 #include "gtkdialog.h"
 #include "gtkhbbox.h"
+#include "gtkvbbox.h"
 #include "gtklabel.h"
 #include "gtkhseparator.h"
+#include "gtkvseparator.h"
 #include "gtkmarshalers.h"
+#include "gtkhbox.h"
 #include "gtkvbox.h"
 #include "gdkkeysyms.h"
 #include "gtkmain.h"
@@ -242,6 +245,9 @@
 {
   GtkDialogPrivate *priv;
 
+#ifdef MAEMO_CHANGES
+  GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+#endif /* MAEMO_CHANGES */
   priv = GET_PRIVATE (dialog);
   priv->ignore_separator = FALSE;
 
@@ -256,10 +262,18 @@
   
   dialog->vbox = gtk_vbox_new (FALSE, 0);
   
+#ifdef MAEMO_CHANGES
+  gtk_container_add (GTK_CONTAINER (dialog), hbox);
+  gtk_widget_show (hbox);
+  gtk_widget_show (dialog->vbox);
+
+  dialog->action_area = gtk_vbutton_box_new ();
+#else
   gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
   gtk_widget_show (dialog->vbox);
 
   dialog->action_area = gtk_hbutton_box_new ();
+#endif /* MAEMO_CHANGES */
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
 #ifdef MAEMO_CHANGES
@@ -268,12 +282,22 @@
                              GTK_BUTTONBOX_END);  
 #endif /* MAEMO_CHANGES */
 
+#ifdef MAEMO_CHANGES
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->action_area,
+                    FALSE, TRUE, 0);
+  gtk_widget_show (dialog->action_area);
+
+  dialog->separator = gtk_vseparator_new ();
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->separator, FALSE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), dialog->vbox, TRUE, TRUE, 0);
+#else
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area,
                     FALSE, TRUE, 0);
   gtk_widget_show (dialog->action_area);
 
   dialog->separator = gtk_hseparator_new ();
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->separator, FALSE, TRUE, 0);
+#endif /* MAEMO_CHANGES */
   gtk_widget_show (dialog->separator);
 
   gtk_window_set_type_hint (GTK_WINDOW (dialog),