GNOME.org
 

[gnumeric] Don't use anymore the "allow-shrink" property [#661720]

commit f6de9ddd1dc31e95c20afe8b3ec05dccf0bdf782
Author: Jean Brefort <jean vaio brefort fr>
Date:   Sat Oct 15 15:02:25 2011 +0200

    Don't use anymore the "allow-shrink" property [#661720]

 NEWS                            |    1 +
 src/dialogs/ChangeLog           |    9 +++++++++
 src/dialogs/cell-format-cond.ui |   22 +++++++++++++---------
 src/dialogs/dialog-autoformat.c |    4 ++--
 src/dialogs/dialog-tabulate.c   |    1 -
 src/dialogs/doc-meta-data.ui    |    7 ++++---
 src/dialogs/goto.ui             |    2 +-
 7 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/NEWS b/NEWS
index e5beda8..f99aa9b 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ Jean:
 	* Make the windows shrink again. [#659246]
 	* Make the graph window work again. [#660241]
 	* Fixed layout issues in cell border dialog. [#661213]
+	* Don't use anymore the "allow-shrink" property [#661720]
 
 Mikko Rasa:
         * Fix ODF import of certain percentage formats. [Debian #642135]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 73afdac..339d5ff 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-15  Jean Brefort  <jean vaio>
+
+	* cell-format-cond.ui: removed deprecated Gtk[H,V]*.
+	* dialog-autoformat.c (dialog_autoformat): ditto.
+	* dialog-tabulate.c (dialog_tabulate): don't use anymore the "allow-shrink"
+	property [#661720]
+	* doc-meta-data.ui: removed deprecated Gtk[H,V]*.
+	* goto.ui: ditto.
+
 2011-10-09  Jean Brefort  <jean vaio>
 
 	* cell-format.ui: fixed border page layout. [#661213]
diff --git a/src/dialogs/cell-format-cond.ui b/src/dialogs/cell-format-cond.ui
index ec263e5..84101e0 100644
--- a/src/dialogs/cell-format-cond.ui
+++ b/src/dialogs/cell-format-cond.ui
@@ -8,9 +8,10 @@
     <property name="title" translatable="yes">Conditional Cell Formatting</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="header-label">
@@ -25,7 +26,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -71,7 +72,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -121,7 +122,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkHButtonBox" id="hbuttonbox2">
+                      <object class="GtkButtonBox" id="hbuttonbox2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="layout_style">start</property>
@@ -191,9 +192,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVButtonBox" id="vbuttonbox1">
+              <object class="GtkButtonBox" id="vbuttonbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <property name="layout_style">center</property>
                 <child>
@@ -260,9 +262,10 @@
                 <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkVBox" id="dialog-vbox1">
+                  <object class="GtkBox" id="dialog-vbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkTable" id="condition-table">
@@ -477,13 +480,14 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox2">
+                      <object class="GtkBox" id="vbox2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <object class="GtkHBox" id="hbox3">
+                          <object class="GtkBox" id="hbox3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -519,7 +523,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHButtonBox" id="hbuttonbox4">
+                          <object class="GtkButtonBox" id="hbuttonbox4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="layout_style">end</property>
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index 313c265..0a305b0 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -101,7 +101,7 @@ typedef struct {
 
 	GocCanvas	 *canvas[NUM_PREVIEWS];
 	GtkFrame         *frame[NUM_PREVIEWS];
-	GtkVScrollbar    *scroll;
+	GtkScrollbar    *scroll;
 	GtkCheckMenuItem *gridlines;
 
 	GtkEntry       *info_name, *info_author, *info_cat;
@@ -589,7 +589,7 @@ dialog_autoformat (WBCGtk *wbcg)
 
 	state->dialog     = GTK_DIALOG (go_gtk_builder_get_widget (gui, "dialog"));
 	state->category   = GTK_COMBO_BOX (go_gtk_builder_get_widget (gui, "format_category"));
-	state->scroll     = GTK_VSCROLLBAR (go_gtk_builder_get_widget (gui, "format_scroll"));
+	state->scroll     = GTK_SCROLLBAR (go_gtk_builder_get_widget (gui, "format_scroll"));
 	state->gridlines  = GTK_CHECK_MENU_ITEM  (go_gtk_builder_get_widget (gui, "format_gridlines"));
 
 	state->info_name   = GTK_ENTRY (go_gtk_builder_get_widget (gui, "format_info_name"));
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index 2c1d0bb..a596317 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -361,7 +361,6 @@ dialog_tabulate (WBCGtk *wbcg, Sheet *sheet)
 	dd->sheet = sheet;
 
 	g_object_set (G_OBJECT (dialog),
-		"allow-shrink",	FALSE,
 		"allow-grow",	TRUE,
 		NULL);
 
diff --git a/src/dialogs/doc-meta-data.ui b/src/dialogs/doc-meta-data.ui
index f666f48..b632a4b 100644
--- a/src/dialogs/doc-meta-data.ui
+++ b/src/dialogs/doc-meta-data.ui
@@ -1637,11 +1637,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">5</property>
-                    <child>
+                    <property name="orientation">vertical</property>
+                   <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow4">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1665,7 +1666,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHButtonBox" id="hbuttonbox3">
+                      <object class="GtkButtonBox" id="hbuttonbox3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">6</property>
diff --git a/src/dialogs/goto.ui b/src/dialogs/goto.ui
index c914d7d..26ac336 100644
--- a/src/dialogs/goto.ui
+++ b/src/dialogs/goto.ui
@@ -113,7 +113,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]