GNOME.org
 

[goocanvas] 2010-11-03 Damon Chaplin <damon gnome org>

commit 79b797c069dab3eadafdbc709210499f72acdae8
Author: Damon Chaplin <damon gnome org>
Date:   Wed Nov 3 10:59:09 2010 +0000

    2010-11-03  Damon Chaplin  <damon gnome org>
    
    	    * Released GooCanvas 1.90.2
    
    2010-11-03  Damon Chaplin  <damon gnome org>
    
    	    * src/goocanvas.c: added goo_canvas_get_preferred_width() and
    	    goo_canvas_get_preferred_height() and removed goo_canvas_size_request().
    
    	    * configure.in: depend on GTK+ 2.91.3 for the above.

 ChangeLog        |   11 +++++++
 configure.in     |   10 +++---
 po/en_GB.po      |   78 +++++++++++++++++++++++++++---------------------------
 po/es.po         |   78 +++++++++++++++++++++++++++---------------------------
 po/goocanvas.pot |   78 +++++++++++++++++++++++++++---------------------------
 po/ja.po         |   78 +++++++++++++++++++++++++++---------------------------
 po/sv.po         |   78 +++++++++++++++++++++++++++---------------------------
 src/goocanvas.c  |   44 +++++++++++++-----------------
 8 files changed, 230 insertions(+), 225 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bb9b0b0..db20dd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-03  Damon Chaplin  <damon gnome org>
+
+	* Released GooCanvas 1.90.2
+
+2010-11-03  Damon Chaplin  <damon gnome org>
+
+	* src/goocanvas.c: added goo_canvas_get_preferred_width() and
+	goo_canvas_get_preferred_height() and removed goo_canvas_size_request().
+
+	* configure.in: depend on GTK+ 2.91.3 for the above.
+
 2010-10-27  Damon Chaplin  <damon gnome org>
 
 	* src/goocanvas.c: switched the get_property/set_property code and
diff --git a/configure.in b/configure.in
index 447d55d..1c4adba 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(goocanvas, 1.90.1)
+AC_INIT(goocanvas, 1.90.2)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/goocanvas.c)
 AC_CONFIG_HEADERS(config.h)
@@ -12,9 +12,9 @@ AM_INIT_AUTOMAKE
 # If interfaces changed but it is backwards compatible: AGE++, else AGE=0.
 #  i.e. the library supports interfaces CURRENT - AGE up to CURRENT.
 #  if two libraries have identical CURRENT and AGE, then newest REVISION used.
-CURRENT=8
-AGE=1
-REVISION=1
+CURRENT=9
+AGE=0
+REVISION=0
 
 LT_VERSION_INFO="$CURRENT:$REVISION:$AGE"
 AC_SUBST(LT_VERSION_INFO)
@@ -26,7 +26,7 @@ AC_PROG_CC
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
-pkg_modules="gtk+-3.0 >= 2.90.0 glib-2.0 >= 2.10.0 cairo >= 1.4.0"
+pkg_modules="gtk+-3.0 >= 2.91.3 glib-2.0 >= 2.10.0 cairo >= 1.4.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
diff --git a/po/en_GB.po b/po/en_GB.po
index b2e65c8..804e076 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GooCanvas CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 15:02+0100\n"
+"POT-Creation-Date: 2010-11-03 10:57+0000\n"
 "PO-Revision-Date: 2006-04-24 16:26+0100\n"
 "Last-Translator: Damon Chaplin <damon gnome org>\n"
 "Language-Team: \n"
@@ -15,162 +15,162 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/goocanvas.c:288
+#: src/goocanvas.c:297
 msgid "Scale"
 msgstr ""
 
-#: src/goocanvas.c:289
+#: src/goocanvas.c:298
 msgid "The magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:295
+#: src/goocanvas.c:304
 msgid "Scale X"
 msgstr ""
 
-#: src/goocanvas.c:296
+#: src/goocanvas.c:305
 msgid "The horizontal magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:302
+#: src/goocanvas.c:311
 msgid "Scale Y"
 msgstr ""
 
-#: src/goocanvas.c:303
+#: src/goocanvas.c:312
 msgid "The vertical magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:309 src/goocanvastext.c:158 src/goocanvaswidget.c:589
+#: src/goocanvas.c:318 src/goocanvastext.c:158 src/goocanvaswidget.c:589
 msgid "Anchor"
 msgstr ""
 
-#: src/goocanvas.c:310
+#: src/goocanvas.c:319
 msgid ""
 "Where to place the canvas when it is smaller than the widget's allocated area"
 msgstr ""
 
-#: src/goocanvas.c:317
+#: src/goocanvas.c:326
 msgid "X1"
 msgstr ""
 
-#: src/goocanvas.c:318
+#: src/goocanvas.c:327
 msgid "The x coordinate of the left edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:325
+#: src/goocanvas.c:334
 msgid "Y1"
 msgstr ""
 
-#: src/goocanvas.c:326
+#: src/goocanvas.c:335
 msgid "The y coordinate of the top edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:333
+#: src/goocanvas.c:342
 msgid "X2"
 msgstr ""
 
-#: src/goocanvas.c:334
+#: src/goocanvas.c:343
 msgid ""
 "The x coordinate of the right edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:342
+#: src/goocanvas.c:351
 msgid "Y2"
 msgstr ""
 
-#: src/goocanvas.c:343
+#: src/goocanvas.c:352
 msgid ""
 "The y coordinate of the bottom edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:352
+#: src/goocanvas.c:361
 msgid "Automatic Bounds"
 msgstr ""
 
-#: src/goocanvas.c:353
+#: src/goocanvas.c:362
 msgid ""
 "If the bounds are automatically calculated based on the bounds of all the "
 "items in the canvas"
 msgstr ""
 
-#: src/goocanvas.c:359
+#: src/goocanvas.c:368
 msgid "Bounds From Origin"
 msgstr ""
 
-#: src/goocanvas.c:360
+#: src/goocanvas.c:369
 msgid "If the automatic bounds are calculated from the origin"
 msgstr ""
 
-#: src/goocanvas.c:366
+#: src/goocanvas.c:375
 msgid "Bounds Padding"
 msgstr ""
 
-#: src/goocanvas.c:367
+#: src/goocanvas.c:376
 msgid "The padding added to the automatic bounds"
 msgstr ""
 
-#: src/goocanvas.c:373
+#: src/goocanvas.c:382
 msgid "Units"
 msgstr ""
 
-#: src/goocanvas.c:374
+#: src/goocanvas.c:383
 msgid "The units to use for the canvas"
 msgstr ""
 
-#: src/goocanvas.c:381
+#: src/goocanvas.c:390
 msgid "Resolution X"
 msgstr ""
 
-#: src/goocanvas.c:382
+#: src/goocanvas.c:391
 msgid "The horizontal resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:389
+#: src/goocanvas.c:398
 msgid "Resolution Y"
 msgstr ""
 
-#: src/goocanvas.c:390
+#: src/goocanvas.c:399
 msgid "The vertical resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:398
+#: src/goocanvas.c:407
 msgid "Background Color"
 msgstr ""
 
-#: src/goocanvas.c:399
+#: src/goocanvas.c:408
 msgid "The color to use for the canvas background"
 msgstr ""
 
-#: src/goocanvas.c:405
+#: src/goocanvas.c:414
 msgid "Background Color RGB"
 msgstr ""
 
-#: src/goocanvas.c:406
+#: src/goocanvas.c:415
 msgid ""
 "The color to use for the canvas background, specified as a 24-bit integer "
 "value, 0xRRGGBB"
 msgstr ""
 
-#: src/goocanvas.c:412
+#: src/goocanvas.c:421
 msgid "Integer Layout"
 msgstr ""
 
-#: src/goocanvas.c:413
+#: src/goocanvas.c:422
 msgid "If all item layout is done to the nearest integer"
 msgstr ""
 
-#: src/goocanvas.c:419
+#: src/goocanvas.c:428
 msgid "Clear Background"
 msgstr ""
 
-#: src/goocanvas.c:420
+#: src/goocanvas.c:429
 msgid "If the background is cleared before the canvas is painted"
 msgstr ""
 
-#: src/goocanvas.c:426
+#: src/goocanvas.c:435
 msgid "Redraw When Scrolled"
 msgstr ""
 
-#: src/goocanvas.c:427
+#: src/goocanvas.c:436
 msgid ""
 "If the canvas is completely redrawn when scrolled, to reduce the flicker of "
 "static items"
diff --git a/po/es.po b/po/es.po
index 60090b5..6cc1804 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GooCanvas CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 15:02+0100\n"
+"POT-Creation-Date: 2010-11-03 10:57+0000\n"
 "PO-Revision-Date: 2006-04-24 16:26+0100\n"
 "Last-Translator: Rafael Villar Burke <pachi rvburke com>\n"
 "Language-Team: \n"
@@ -13,151 +13,151 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/goocanvas.c:288
+#: src/goocanvas.c:297
 msgid "Scale"
 msgstr "Escala"
 
-#: src/goocanvas.c:289
+#: src/goocanvas.c:298
 msgid "The magnification factor of the canvas"
 msgstr "Factor de ampliación del lienzo"
 
-#: src/goocanvas.c:295
+#: src/goocanvas.c:304
 #, fuzzy
 msgid "Scale X"
 msgstr "Escala"
 
-#: src/goocanvas.c:296
+#: src/goocanvas.c:305
 #, fuzzy
 msgid "The horizontal magnification factor of the canvas"
 msgstr "Factor de ampliación del lienzo"
 
-#: src/goocanvas.c:302
+#: src/goocanvas.c:311
 #, fuzzy
 msgid "Scale Y"
 msgstr "Escala"
 
-#: src/goocanvas.c:303
+#: src/goocanvas.c:312
 #, fuzzy
 msgid "The vertical magnification factor of the canvas"
 msgstr "Factor de ampliación del lienzo"
 
-#: src/goocanvas.c:309 src/goocanvastext.c:158 src/goocanvaswidget.c:589
+#: src/goocanvas.c:318 src/goocanvastext.c:158 src/goocanvaswidget.c:589
 msgid "Anchor"
 msgstr "Ancla"
 
-#: src/goocanvas.c:310
+#: src/goocanvas.c:319
 msgid ""
 "Where to place the canvas when it is smaller than the widget's allocated area"
 msgstr "Dónde situar el lienzo cuando es menor que el área asignada al control"
 
-#: src/goocanvas.c:317
+#: src/goocanvas.c:326
 msgid "X1"
 msgstr "X1"
 
-#: src/goocanvas.c:318
+#: src/goocanvas.c:327
 msgid "The x coordinate of the left edge of the canvas bounds, in canvas units"
 msgstr ""
 "Coordenada x del borde izquierdo de los límites del lienzo, en unidades del "
 "lienzo"
 
-#: src/goocanvas.c:325
+#: src/goocanvas.c:334
 msgid "Y1"
 msgstr "Y1"
 
-#: src/goocanvas.c:326
+#: src/goocanvas.c:335
 msgid "The y coordinate of the top edge of the canvas bounds, in canvas units"
 msgstr ""
 "Coordenada y del borde superior de los límites del lienzo, en unidades del "
 "lienzo"
 
-#: src/goocanvas.c:333
+#: src/goocanvas.c:342
 msgid "X2"
 msgstr "X2"
 
-#: src/goocanvas.c:334
+#: src/goocanvas.c:343
 msgid ""
 "The x coordinate of the right edge of the canvas bounds, in canvas units"
 msgstr ""
 "Coordenada x del borde derecho de los límites del lienzo, en unidades del "
 "lienzo"
 
-#: src/goocanvas.c:342
+#: src/goocanvas.c:351
 msgid "Y2"
 msgstr "Y2"
 
-#: src/goocanvas.c:343
+#: src/goocanvas.c:352
 msgid ""
 "The y coordinate of the bottom edge of the canvas bounds, in canvas units"
 msgstr ""
 "Coordenada y del borde inferior de los límites del lienzo, en unidades del "
 "lienzo"
 
-#: src/goocanvas.c:352
+#: src/goocanvas.c:361
 msgid "Automatic Bounds"
 msgstr ""
 
-#: src/goocanvas.c:353
+#: src/goocanvas.c:362
 msgid ""
 "If the bounds are automatically calculated based on the bounds of all the "
 "items in the canvas"
 msgstr ""
 
-#: src/goocanvas.c:359
+#: src/goocanvas.c:368
 msgid "Bounds From Origin"
 msgstr ""
 
-#: src/goocanvas.c:360
+#: src/goocanvas.c:369
 msgid "If the automatic bounds are calculated from the origin"
 msgstr ""
 
-#: src/goocanvas.c:366
+#: src/goocanvas.c:375
 #, fuzzy
 msgid "Bounds Padding"
 msgstr "Margen superior"
 
-#: src/goocanvas.c:367
+#: src/goocanvas.c:376
 msgid "The padding added to the automatic bounds"
 msgstr ""
 
-#: src/goocanvas.c:373
+#: src/goocanvas.c:382
 msgid "Units"
 msgstr "Unidades"
 
-#: src/goocanvas.c:374
+#: src/goocanvas.c:383
 msgid "The units to use for the canvas"
 msgstr "Unidades que se han de usar para el lienzo"
 
-#: src/goocanvas.c:381
+#: src/goocanvas.c:390
 msgid "Resolution X"
 msgstr "Resolución X"
 
-#: src/goocanvas.c:382
+#: src/goocanvas.c:391
 msgid "The horizontal resolution of the display, in dots per inch"
 msgstr "Resolución horizontal de la pantalla, en puntos por pulgada"
 
-#: src/goocanvas.c:389
+#: src/goocanvas.c:398
 msgid "Resolution Y"
 msgstr "Resolución Y"
 
-#: src/goocanvas.c:390
+#: src/goocanvas.c:399
 msgid "The vertical resolution of the display, in dots per inch"
 msgstr "Resolución vertical de la pantalla, en puntos por pulgada"
 
-#: src/goocanvas.c:398
+#: src/goocanvas.c:407
 msgid "Background Color"
 msgstr ""
 
-#: src/goocanvas.c:399
+#: src/goocanvas.c:408
 #, fuzzy
 msgid "The color to use for the canvas background"
 msgstr "Unidades que se han de usar para el lienzo"
 
-#: src/goocanvas.c:405
+#: src/goocanvas.c:414
 #, fuzzy
 msgid "Background Color RGB"
 msgstr "RGBA del color de trazo"
 
-#: src/goocanvas.c:406
+#: src/goocanvas.c:415
 #, fuzzy
 msgid ""
 "The color to use for the canvas background, specified as a 24-bit integer "
@@ -166,27 +166,27 @@ msgstr ""
 "Color que se ha de usar para el perímetro del elemento, especificado como un "
 "entero de 32-bits"
 
-#: src/goocanvas.c:412
+#: src/goocanvas.c:421
 msgid "Integer Layout"
 msgstr ""
 
-#: src/goocanvas.c:413
+#: src/goocanvas.c:422
 msgid "If all item layout is done to the nearest integer"
 msgstr ""
 
-#: src/goocanvas.c:419
+#: src/goocanvas.c:428
 msgid "Clear Background"
 msgstr ""
 
-#: src/goocanvas.c:420
+#: src/goocanvas.c:429
 msgid "If the background is cleared before the canvas is painted"
 msgstr ""
 
-#: src/goocanvas.c:426
+#: src/goocanvas.c:435
 msgid "Redraw When Scrolled"
 msgstr ""
 
-#: src/goocanvas.c:427
+#: src/goocanvas.c:436
 msgid ""
 "If the canvas is completely redrawn when scrolled, to reduce the flicker of "
 "static items"
diff --git a/po/goocanvas.pot b/po/goocanvas.pot
index 9f3f3e6..0ccc5cd 100644
--- a/po/goocanvas.pot
+++ b/po/goocanvas.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 15:02+0100\n"
+"POT-Creation-Date: 2010-11-03 10:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -16,162 +16,162 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/goocanvas.c:288
+#: src/goocanvas.c:297
 msgid "Scale"
 msgstr ""
 
-#: src/goocanvas.c:289
+#: src/goocanvas.c:298
 msgid "The magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:295
+#: src/goocanvas.c:304
 msgid "Scale X"
 msgstr ""
 
-#: src/goocanvas.c:296
+#: src/goocanvas.c:305
 msgid "The horizontal magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:302
+#: src/goocanvas.c:311
 msgid "Scale Y"
 msgstr ""
 
-#: src/goocanvas.c:303
+#: src/goocanvas.c:312
 msgid "The vertical magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:309 src/goocanvastext.c:158 src/goocanvaswidget.c:589
+#: src/goocanvas.c:318 src/goocanvastext.c:158 src/goocanvaswidget.c:589
 msgid "Anchor"
 msgstr ""
 
-#: src/goocanvas.c:310
+#: src/goocanvas.c:319
 msgid ""
 "Where to place the canvas when it is smaller than the widget's allocated area"
 msgstr ""
 
-#: src/goocanvas.c:317
+#: src/goocanvas.c:326
 msgid "X1"
 msgstr ""
 
-#: src/goocanvas.c:318
+#: src/goocanvas.c:327
 msgid "The x coordinate of the left edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:325
+#: src/goocanvas.c:334
 msgid "Y1"
 msgstr ""
 
-#: src/goocanvas.c:326
+#: src/goocanvas.c:335
 msgid "The y coordinate of the top edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:333
+#: src/goocanvas.c:342
 msgid "X2"
 msgstr ""
 
-#: src/goocanvas.c:334
+#: src/goocanvas.c:343
 msgid ""
 "The x coordinate of the right edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:342
+#: src/goocanvas.c:351
 msgid "Y2"
 msgstr ""
 
-#: src/goocanvas.c:343
+#: src/goocanvas.c:352
 msgid ""
 "The y coordinate of the bottom edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:352
+#: src/goocanvas.c:361
 msgid "Automatic Bounds"
 msgstr ""
 
-#: src/goocanvas.c:353
+#: src/goocanvas.c:362
 msgid ""
 "If the bounds are automatically calculated based on the bounds of all the "
 "items in the canvas"
 msgstr ""
 
-#: src/goocanvas.c:359
+#: src/goocanvas.c:368
 msgid "Bounds From Origin"
 msgstr ""
 
-#: src/goocanvas.c:360
+#: src/goocanvas.c:369
 msgid "If the automatic bounds are calculated from the origin"
 msgstr ""
 
-#: src/goocanvas.c:366
+#: src/goocanvas.c:375
 msgid "Bounds Padding"
 msgstr ""
 
-#: src/goocanvas.c:367
+#: src/goocanvas.c:376
 msgid "The padding added to the automatic bounds"
 msgstr ""
 
-#: src/goocanvas.c:373
+#: src/goocanvas.c:382
 msgid "Units"
 msgstr ""
 
-#: src/goocanvas.c:374
+#: src/goocanvas.c:383
 msgid "The units to use for the canvas"
 msgstr ""
 
-#: src/goocanvas.c:381
+#: src/goocanvas.c:390
 msgid "Resolution X"
 msgstr ""
 
-#: src/goocanvas.c:382
+#: src/goocanvas.c:391
 msgid "The horizontal resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:389
+#: src/goocanvas.c:398
 msgid "Resolution Y"
 msgstr ""
 
-#: src/goocanvas.c:390
+#: src/goocanvas.c:399
 msgid "The vertical resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:398
+#: src/goocanvas.c:407
 msgid "Background Color"
 msgstr ""
 
-#: src/goocanvas.c:399
+#: src/goocanvas.c:408
 msgid "The color to use for the canvas background"
 msgstr ""
 
-#: src/goocanvas.c:405
+#: src/goocanvas.c:414
 msgid "Background Color RGB"
 msgstr ""
 
-#: src/goocanvas.c:406
+#: src/goocanvas.c:415
 msgid ""
 "The color to use for the canvas background, specified as a 24-bit integer "
 "value, 0xRRGGBB"
 msgstr ""
 
-#: src/goocanvas.c:412
+#: src/goocanvas.c:421
 msgid "Integer Layout"
 msgstr ""
 
-#: src/goocanvas.c:413
+#: src/goocanvas.c:422
 msgid "If all item layout is done to the nearest integer"
 msgstr ""
 
-#: src/goocanvas.c:419
+#: src/goocanvas.c:428
 msgid "Clear Background"
 msgstr ""
 
-#: src/goocanvas.c:420
+#: src/goocanvas.c:429
 msgid "If the background is cleared before the canvas is painted"
 msgstr ""
 
-#: src/goocanvas.c:426
+#: src/goocanvas.c:435
 msgid "Redraw When Scrolled"
 msgstr ""
 
-#: src/goocanvas.c:427
+#: src/goocanvas.c:436
 msgid ""
 "If the canvas is completely redrawn when scrolled, to reduce the flicker of "
 "static items"
diff --git a/po/ja.po b/po/ja.po
index f780296..8250029 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GooCanvas CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 15:02+0100\n"
+"POT-Creation-Date: 2010-11-03 10:57+0000\n"
 "PO-Revision-Date: 2008-04-28 20:42+0900\n"
 "Last-Translator: kou cozmixng org <kou cozmixng org>\n"
 "Language-Team:\n"
@@ -16,163 +16,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/goocanvas.c:288
+#: src/goocanvas.c:297
 msgid "Scale"
 msgstr "����"
 
-#: src/goocanvas.c:289
+#: src/goocanvas.c:298
 msgid "The magnification factor of the canvas"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã?®æ?¡å¤§ç??"
 
-#: src/goocanvas.c:295
+#: src/goocanvas.c:304
 msgid "Scale X"
 msgstr "Xæ?¹å??ã?®ã?¹ã?±ã?¼ã?«"
 
-#: src/goocanvas.c:296
+#: src/goocanvas.c:305
 msgid "The horizontal magnification factor of the canvas"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã?®æ°´å¹³æ?¹å??ã?®æ?¡å¤§ç??"
 
-#: src/goocanvas.c:302
+#: src/goocanvas.c:311
 msgid "Scale Y"
 msgstr "Yæ?¹å??ã?®ã?¹ã?±ã?¼ã?«"
 
-#: src/goocanvas.c:303
+#: src/goocanvas.c:312
 msgid "The vertical magnification factor of the canvas"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã?®å??ç?´æ?¹å??ã?®æ?¡å¤§ç??"
 
-#: src/goocanvas.c:309 src/goocanvastext.c:158 src/goocanvaswidget.c:589
+#: src/goocanvas.c:318 src/goocanvastext.c:158 src/goocanvaswidget.c:589
 msgid "Anchor"
 msgstr "����"
 
-#: src/goocanvas.c:310
+#: src/goocanvas.c:319
 msgid ""
 "Where to place the canvas when it is smaller than the widget's allocated area"
 msgstr "ã?¦ã?£ã?¸ã?§ã??ã??ã?®é ?å??ã??ã??ã??å°?ã??ã??ã?ªã?£ã??ã?¨ã??ã?«ã?­ã?£ã?³ã??ã?¹ã??ã?©ã??ã?«ã??ã??ã??"
 
-#: src/goocanvas.c:317
+#: src/goocanvas.c:326
 msgid "X1"
 msgstr "X1"
 
-#: src/goocanvas.c:318
+#: src/goocanvas.c:327
 msgid "The x coordinate of the left edge of the canvas bounds, in canvas units"
 msgstr "ã?­ã?£ã?³ã??ã?¹å·¦ç«¯ã?® X 座æ¨? (ã?­ã?£ã?³ã??ã?¹ã?®å??ä½?ã?§æ??å®?)"
 
-#: src/goocanvas.c:325
+#: src/goocanvas.c:334
 msgid "Y1"
 msgstr "Y1"
 
-#: src/goocanvas.c:326
+#: src/goocanvas.c:335
 msgid "The y coordinate of the top edge of the canvas bounds, in canvas units"
 msgstr "ã?­ã?£ã?³ã??ã?¹ä¸?端ã?® Y 座æ¨? (ã?­ã?£ã?³ã??ã?¹ã?®å??ä½?ã?§æ??å®?)"
 
-#: src/goocanvas.c:333
+#: src/goocanvas.c:342
 msgid "X2"
 msgstr "X2"
 
-#: src/goocanvas.c:334
+#: src/goocanvas.c:343
 msgid ""
 "The x coordinate of the right edge of the canvas bounds, in canvas units"
 msgstr "ã?­ã?£ã?³ã??ã?¹å?³ç«¯ã?® X 座æ¨? (ã?­ã?£ã?³ã??ã?¹ã?®å??ä½?ã?§æ??å®?)"
 
-#: src/goocanvas.c:342
+#: src/goocanvas.c:351
 msgid "Y2"
 msgstr "Y2"
 
-#: src/goocanvas.c:343
+#: src/goocanvas.c:352
 msgid ""
 "The y coordinate of the bottom edge of the canvas bounds, in canvas units"
 msgstr "ã?­ã?£ã?³ã??ã?¹ä¸?端ã?® Y 座æ¨? (ã?­ã?£ã?³ã??ã?¹ã?®å??ä½?ã?§æ??å®?)"
 
-#: src/goocanvas.c:352
+#: src/goocanvas.c:361
 msgid "Automatic Bounds"
 msgstr "è?ªå??å¢?ç??è¨?ç®?"
 
-#: src/goocanvas.c:353
+#: src/goocanvas.c:362
 msgid ""
 "If the bounds are automatically calculated based on the bounds of all the "
 "items in the canvas"
 msgstr ""
 "ã?­ã?£ã?³ã??ã?¹ã?®ã??ã?¹ã?¦ã?®ã?¢ã?¤ã??ã? ã?®å¢?ç??ã??å??ã?«ã??ã?¦è?ªå??ç??ã?«å¢?ç??ã??è¨?ç®?ã??ã??ã??ã?©ã??ã??"
 
-#: src/goocanvas.c:359
+#: src/goocanvas.c:368
 msgid "Bounds From Origin"
 msgstr "å??ç?¹ã??ã??ã?®å¢?ç??è¨?ç®?"
 
-#: src/goocanvas.c:360
+#: src/goocanvas.c:369
 msgid "If the automatic bounds are calculated from the origin"
 msgstr "è?ªå??å¢?ç??è¨?ç®?ã??å??ç?¹ã??ã??è¡?ã??ã??ã?©ã??ã??"
 
-#: src/goocanvas.c:366
+#: src/goocanvas.c:375
 msgid "Bounds Padding"
 msgstr "å¢?ç??é?¨ã?®ã??ã??ã?£ã?³ã?°"
 
-#: src/goocanvas.c:367
+#: src/goocanvas.c:376
 msgid "The padding added to the automatic bounds"
 msgstr "è?ªå??å¢?ç??è¨?ç®?ã?§è¿½å? ã??ã??ã??ã??ã??ã?£ã?³ã?°"
 
-#: src/goocanvas.c:373
+#: src/goocanvas.c:382
 msgid "Units"
 msgstr "å??ä½?"
 
-#: src/goocanvas.c:374
+#: src/goocanvas.c:383
 msgid "The units to use for the canvas"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã?§ä½¿ã??å??ä½?"
 
-#: src/goocanvas.c:381
+#: src/goocanvas.c:390
 msgid "Resolution X"
 msgstr "X æ?¹å??ã?®è§£å??度"
 
-#: src/goocanvas.c:382
+#: src/goocanvas.c:391
 msgid "The horizontal resolution of the display, in dots per inch"
 msgstr "ç?»é?¢ã?®æ°´å¹³è§£å??度 (ã??ã??ã??/ã?¤ã?³ã??ã??DPI)"
 
-#: src/goocanvas.c:389
+#: src/goocanvas.c:398
 msgid "Resolution Y"
 msgstr "Y æ?¹å??ã?®è§£å??度"
 
-#: src/goocanvas.c:390
+#: src/goocanvas.c:399
 msgid "The vertical resolution of the display, in dots per inch"
 msgstr "ç?»é?¢ã?®å??ç?´è§£å??度 (ã??ã??ã??/ã?¤ã?³ã??ã??DPI)"
 
-#: src/goocanvas.c:398
+#: src/goocanvas.c:407
 msgid "Background Color"
 msgstr "è??æ?¯è?²"
 
-#: src/goocanvas.c:399
+#: src/goocanvas.c:408
 msgid "The color to use for the canvas background"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã?®è??æ?¯è?²"
 
-#: src/goocanvas.c:405
+#: src/goocanvas.c:414
 msgid "Background Color RGB"
 msgstr "è??æ?¯è?²ã?®RGB表ç?¾"
 
-#: src/goocanvas.c:406
+#: src/goocanvas.c:415
 msgid ""
 "The color to use for the canvas background, specified as a 24-bit integer "
 "value, 0xRRGGBB"
 msgstr "24ã??ã??ã??ã?®æ?´æ?°å?¤(0xRRGGBB)ã?§æ??å®?ã??ã??ã?­ã?£ã?³ã??ã?¹ã?®è??æ?¯è?²"
 
-#: src/goocanvas.c:412
+#: src/goocanvas.c:421
 msgid "Integer Layout"
 msgstr "æ?´æ?°é??ç½®"
 
-#: src/goocanvas.c:413
+#: src/goocanvas.c:422
 msgid "If all item layout is done to the nearest integer"
 msgstr "ã??ã?¹ã?¦ã?®ã?¢ã?¤ã??ã? ã??è¿?ä¼¼æ?´æ?°ã?§é??ç½®ã??ã??ã??ã?©ã??ã??"
 
-#: src/goocanvas.c:419
+#: src/goocanvas.c:428
 msgid "Clear Background"
 msgstr "è??æ?¯æ¶?å?»"
 
-#: src/goocanvas.c:420
+#: src/goocanvas.c:429
 msgid "If the background is cleared before the canvas is painted"
 msgstr "ã?­ã?£ã?³ã??ã?¹ã??æ??ç?»ã??ã??å??ã?«è??æ?¯ã??æ¶?å?»ã??ã??ã??ã?©ã??ã??"
 
-#: src/goocanvas.c:426
+#: src/goocanvas.c:435
 msgid "Redraw When Scrolled"
 msgstr ""
 
-#: src/goocanvas.c:427
+#: src/goocanvas.c:436
 msgid ""
 "If the canvas is completely redrawn when scrolled, to reduce the flicker of "
 "static items"
diff --git a/po/sv.po b/po/sv.po
index ca46d27..4432979 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: goocanvas\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 15:02+0100\n"
+"POT-Creation-Date: 2010-11-03 10:57+0000\n"
 "PO-Revision-Date: 2010-07-27 12:08+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -16,162 +16,162 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/goocanvas.c:288
+#: src/goocanvas.c:297
 msgid "Scale"
 msgstr "Skala"
 
-#: src/goocanvas.c:289
+#: src/goocanvas.c:298
 msgid "The magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:295
+#: src/goocanvas.c:304
 msgid "Scale X"
 msgstr ""
 
-#: src/goocanvas.c:296
+#: src/goocanvas.c:305
 msgid "The horizontal magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:302
+#: src/goocanvas.c:311
 msgid "Scale Y"
 msgstr ""
 
-#: src/goocanvas.c:303
+#: src/goocanvas.c:312
 msgid "The vertical magnification factor of the canvas"
 msgstr ""
 
-#: src/goocanvas.c:309 src/goocanvastext.c:158 src/goocanvaswidget.c:589
+#: src/goocanvas.c:318 src/goocanvastext.c:158 src/goocanvaswidget.c:589
 msgid "Anchor"
 msgstr "Ankare"
 
-#: src/goocanvas.c:310
+#: src/goocanvas.c:319
 msgid ""
 "Where to place the canvas when it is smaller than the widget's allocated area"
 msgstr ""
 
-#: src/goocanvas.c:317
+#: src/goocanvas.c:326
 msgid "X1"
 msgstr "X1"
 
-#: src/goocanvas.c:318
+#: src/goocanvas.c:327
 msgid "The x coordinate of the left edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:325
+#: src/goocanvas.c:334
 msgid "Y1"
 msgstr "Y1"
 
-#: src/goocanvas.c:326
+#: src/goocanvas.c:335
 msgid "The y coordinate of the top edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:333
+#: src/goocanvas.c:342
 msgid "X2"
 msgstr "X2"
 
-#: src/goocanvas.c:334
+#: src/goocanvas.c:343
 msgid ""
 "The x coordinate of the right edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:342
+#: src/goocanvas.c:351
 msgid "Y2"
 msgstr "Y2"
 
-#: src/goocanvas.c:343
+#: src/goocanvas.c:352
 msgid ""
 "The y coordinate of the bottom edge of the canvas bounds, in canvas units"
 msgstr ""
 
-#: src/goocanvas.c:352
+#: src/goocanvas.c:361
 msgid "Automatic Bounds"
 msgstr ""
 
-#: src/goocanvas.c:353
+#: src/goocanvas.c:362
 msgid ""
 "If the bounds are automatically calculated based on the bounds of all the "
 "items in the canvas"
 msgstr ""
 
-#: src/goocanvas.c:359
+#: src/goocanvas.c:368
 msgid "Bounds From Origin"
 msgstr ""
 
-#: src/goocanvas.c:360
+#: src/goocanvas.c:369
 msgid "If the automatic bounds are calculated from the origin"
 msgstr ""
 
-#: src/goocanvas.c:366
+#: src/goocanvas.c:375
 msgid "Bounds Padding"
 msgstr ""
 
-#: src/goocanvas.c:367
+#: src/goocanvas.c:376
 msgid "The padding added to the automatic bounds"
 msgstr ""
 
-#: src/goocanvas.c:373
+#: src/goocanvas.c:382
 msgid "Units"
 msgstr ""
 
-#: src/goocanvas.c:374
+#: src/goocanvas.c:383
 msgid "The units to use for the canvas"
 msgstr ""
 
-#: src/goocanvas.c:381
+#: src/goocanvas.c:390
 msgid "Resolution X"
 msgstr ""
 
-#: src/goocanvas.c:382
+#: src/goocanvas.c:391
 msgid "The horizontal resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:389
+#: src/goocanvas.c:398
 msgid "Resolution Y"
 msgstr ""
 
-#: src/goocanvas.c:390
+#: src/goocanvas.c:399
 msgid "The vertical resolution of the display, in dots per inch"
 msgstr ""
 
-#: src/goocanvas.c:398
+#: src/goocanvas.c:407
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
 
-#: src/goocanvas.c:399
+#: src/goocanvas.c:408
 msgid "The color to use for the canvas background"
 msgstr ""
 
-#: src/goocanvas.c:405
+#: src/goocanvas.c:414
 msgid "Background Color RGB"
 msgstr ""
 
-#: src/goocanvas.c:406
+#: src/goocanvas.c:415
 msgid ""
 "The color to use for the canvas background, specified as a 24-bit integer "
 "value, 0xRRGGBB"
 msgstr ""
 
-#: src/goocanvas.c:412
+#: src/goocanvas.c:421
 msgid "Integer Layout"
 msgstr ""
 
-#: src/goocanvas.c:413
+#: src/goocanvas.c:422
 msgid "If all item layout is done to the nearest integer"
 msgstr ""
 
-#: src/goocanvas.c:419
+#: src/goocanvas.c:428
 msgid "Clear Background"
 msgstr ""
 
-#: src/goocanvas.c:420
+#: src/goocanvas.c:429
 msgid "If the background is cleared before the canvas is painted"
 msgstr ""
 
-#: src/goocanvas.c:426
+#: src/goocanvas.c:435
 msgid "Redraw When Scrolled"
 msgstr ""
 
-#: src/goocanvas.c:427
+#: src/goocanvas.c:436
 msgid ""
 "If the canvas is completely redrawn when scrolled, to reduce the flicker of "
 "static items"
diff --git a/src/goocanvas.c b/src/goocanvas.c
index dd3433d..79b70a6 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -161,8 +161,12 @@ static void     goo_canvas_unrealize	   (GtkWidget	     *widget);
 static void     goo_canvas_map		   (GtkWidget	     *widget);
 static void     goo_canvas_style_set	   (GtkWidget	     *widget,
 					    GtkStyle	     *old_style);
-static void     goo_canvas_size_request    (GtkWidget        *widget,
-					    GtkRequisition   *requisition);
+static void     goo_canvas_get_preferred_width (GtkWidget     *widget,
+						gint          *minimum,
+						gint          *natural);
+static void     goo_canvas_get_preferred_height (GtkWidget     *widget,
+						 gint          *minimum,
+						 gint          *natural);
 static void     goo_canvas_size_allocate   (GtkWidget        *widget,
 					    GtkAllocation    *allocation);
 static void     goo_canvas_set_hadjustment (GooCanvas        *canvas,
@@ -258,7 +262,8 @@ goo_canvas_class_init (GooCanvasClass *klass)
   widget_class->realize              = goo_canvas_realize;
   widget_class->unrealize            = goo_canvas_unrealize;
   widget_class->map                  = goo_canvas_map;
-  widget_class->size_request         = goo_canvas_size_request;
+  widget_class->get_preferred_width  = goo_canvas_get_preferred_width;
+  widget_class->get_preferred_height = goo_canvas_get_preferred_height;
   widget_class->size_allocate        = goo_canvas_size_allocate;
   widget_class->style_set            = goo_canvas_style_set;
   widget_class->draw                 = goo_canvas_draw;
@@ -1934,31 +1939,20 @@ reconfigure_canvas (GooCanvas *canvas,
 
 
 static void
-goo_canvas_size_request (GtkWidget      *widget,
-			 GtkRequisition *requisition)
+goo_canvas_get_preferred_width (GtkWidget *widget,
+				gint      *minimal_width,
+				gint      *natural_width)
 {
-  GList *tmp_list;
-  GooCanvas *canvas;
-
-  g_return_if_fail (GOO_IS_CANVAS (widget));
-
-  canvas = GOO_CANVAS (widget);
-
-  requisition->width = 0;
-  requisition->height = 0;
-
-  tmp_list = canvas->widget_items;
-
-  while (tmp_list)
-    {
-      GooCanvasWidget *witem = tmp_list->data;
-      GtkRequisition child_requisition;
+  *minimal_width = *natural_width = 0;
+}
 
-      tmp_list = tmp_list->next;
 
-      if (witem->widget)
-	gtk_widget_size_request (witem->widget, &child_requisition);
-    }
+static void
+goo_canvas_get_preferred_height (GtkWidget *widget,
+				 gint      *minimal_height,
+				 gint      *natural_height)
+{
+  *minimal_height = *natural_height = 0;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]