GNOME.org
 

[goocanvas] 2010-06-21 Damon Chaplin <damon gnome org>

commit 39f06b3bb38f9c256c6c84554b4fdc2767e68d20
Author: Damon Chaplin <damon gnome org>
Date:   Mon Jun 21 10:22:29 2010 +0100

    2010-06-21  Damon Chaplin  <damon gnome org>
    
    	    * Released GooCanvas 1.90.0
    
    2010-06-21  Damon Chaplin  <damon gnome org>
    
    	    Got rid of all the GTK_CHECK_VERSION stuff as we depend on 3.0 now.

 .gitignore            |    3 +
 ChangeLog             |    8 +++
 README                |    3 +
 configure.in          |   10 ++--
 docs/Makefile.am      |    2 +-
 po/ChangeLog          |    4 ++
 po/LINGUAS            |    3 +
 po/goocanvas.pot      |   10 +++-
 src/goocanvas.c       |  120 +++++++-----------------------------------------
 src/goocanvasatk.c    |    7 +---
 src/goocanvaswidget.c |    8 ---
 11 files changed, 53 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0a6d03..4f18981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ Makefile.in
 /demo/widgets-demo
 /depcomp
 /goocanvas.pc
+/goocanvas-2.0.pc
 /gtk-doc.make
 /install-sh
 /libtool
@@ -41,6 +42,7 @@ Makefile.in
 /missing
 /mkinstalldirs
 /po/POTFILES
+/po/Makefile.in.in
 /src/goocanvasenumtypes.c
 /src/goocanvasenumtypes.h
 /src/goocanvasmarshal.c
@@ -62,3 +64,4 @@ Makefile.in
 /docs/html
 /docs/xml
 /docs/tmpl/goo*.sgml
+/docs/tmpl/goo*.bak
diff --git a/ChangeLog b/ChangeLog
index ba49467..f30075d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-21  Damon Chaplin  <damon gnome org>
+
+	* Released GooCanvas 1.90.0
+
+2010-06-21  Damon Chaplin  <damon gnome org>
+
+	Got rid of all the GTK_CHECK_VERSION stuff as we depend on 3.0 now.
+
 2010-06-11  Murray Cumming  <murrayc murrayc com>
 
 	Update source code for GTK+ 3.
diff --git a/README b/README
index 4ed41f4..3205ba7 100644
--- a/README
+++ b/README
@@ -1,4 +1,7 @@
 
+  NOTE: The 1.0.9x versions are unstable development releases and should only
+        be used for development and testing. The API may change before 2.0.
+
 
 			   Welcome to GooCanvas
                            ====================
diff --git a/configure.in b/configure.in
index 00f2334..bbc7a63 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, 0.15)
+AC_INIT(goocanvas, 1.90.0)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/goocanvas.c)
 AC_CONFIG_HEADERS(config.h)
@@ -12,8 +12,8 @@ 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=7
-AGE=4
+CURRENT=8
+AGE=0
 REVISION=0
 
 LT_VERSION_INFO="$CURRENT:$REVISION:$AGE"
@@ -35,8 +35,8 @@ GETTEXT_PACKAGE=goocanvas
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
 
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="en_GB es ja"
+dnl i18n
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6c7b00c..bd866a0 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -75,7 +75,7 @@ content_files= $(expand_content_files)
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src @PACKAGE_CFLAGS@
-GTKDOC_LIBS= PACKAGE_LIBS@ $(top_builddir)/src/libgoocanvas.la
+GTKDOC_LIBS= PACKAGE_LIBS@ $(top_builddir)/src/libgoocanvas-2.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/po/ChangeLog b/po/ChangeLog
index 3db818c..4b611ab 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-21  Damon Chaplin  <damon gnome org>
+
+	* LINGUAS: created.
+
 2008-12-29  Damon Chaplin  <damon gnome org>
 
 	* POTFILES.in: added goocanvasgrid.c.
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..694e4e6
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,3 @@
+en_GB
+es
+ja
diff --git a/po/goocanvas.pot b/po/goocanvas.pot
index 7be1805..2171766 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: 2009-06-29 16:23+0100\n"
+"POT-Creation-Date: 2010-06-21 10:19+0100\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"
@@ -1093,11 +1093,15 @@ msgid "The y coordinate of the text"
 msgstr ""
 
 #: src/goocanvastext.c:142
-msgid "The width to use to layout the text"
+msgid ""
+"The width to use to layout the text, or -1 to let the text use as much "
+"horizontal space as needed"
 msgstr ""
 
 #: src/goocanvastext.c:150
-msgid "The height to use to layout the text, or -1 to use the natural height"
+msgid ""
+"The height to use to layout the text, or -1 to let the text use as much "
+"vertical space as needed"
 msgstr ""
 
 #: src/goocanvastext.c:159
diff --git a/src/goocanvas.c b/src/goocanvas.c
index 30ae902..cfa51a5 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -951,11 +951,7 @@ goo_canvas_set_root_item_model (GooCanvas          *canvas,
   goo_canvas_item_set_canvas (canvas->root_item, canvas);
   canvas->need_update = TRUE;
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-   if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
     goo_canvas_update (canvas);
 
   gtk_widget_queue_draw (GTK_WIDGET (canvas));
@@ -1011,11 +1007,7 @@ goo_canvas_set_root_item    (GooCanvas		*canvas,
 
   canvas->need_update = TRUE;
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-   if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
     goo_canvas_update (canvas);
 
   gtk_widget_queue_draw (GTK_WIDGET (canvas));
@@ -1090,11 +1082,7 @@ goo_canvas_set_static_root_item    (GooCanvas		*canvas,
 
   canvas->need_update = TRUE;
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-   if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
     goo_canvas_update (canvas);
 
   gtk_widget_queue_draw (GTK_WIDGET (canvas));
@@ -1183,11 +1171,7 @@ goo_canvas_set_static_root_item_model (GooCanvas	  *canvas,
   goo_canvas_item_set_is_static (priv->static_root_item, TRUE);
   canvas->need_update = TRUE;
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-   if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
     goo_canvas_update (canvas);
 
   gtk_widget_queue_draw (GTK_WIDGET (canvas));
@@ -1574,17 +1558,9 @@ goo_canvas_map (GtkWidget *widget)
       GooCanvasWidget *witem = tmp_list->data;
       tmp_list = tmp_list->next;
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-       if (witem->widget && gtk_widget_get_visible (witem->widget))
-#else
-       if (witem->widget && GTK_WIDGET_VISIBLE (witem->widget))
-#endif
+      if (witem->widget && gtk_widget_get_visible (witem->widget))
  	{
-#if GTK_CHECK_VERSION(2, 19, 6)
 	  if (!gtk_widget_get_mapped (witem->widget))
-#else
-          if (!GTK_WIDGET_MAPPED (witem->widget))
-#endif
 	    gtk_widget_map (witem->widget);
 	}
     }
@@ -1601,11 +1577,7 @@ goo_canvas_style_set (GtkWidget *widget,
   if (GTK_WIDGET_CLASS (goo_canvas_parent_class)->style_set)
     GTK_WIDGET_CLASS (goo_canvas_parent_class)->style_set (widget, old_style);
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-   if (gtk_widget_get_realized (widget))
-#else
-   if (GTK_WIDGET_REALIZED (widget))
-#endif
+  if (gtk_widget_get_realized (widget))
     {
       /* Make sure the window backgrounds aren't set, to avoid flicker when
 	 scrolling (due to the delay between X clearing the background and
@@ -1727,11 +1699,7 @@ request_static_redraw (GooCanvas             *canvas,
   GooCanvasPrivate *priv = GOO_CANVAS_GET_PRIVATE (canvas);
   GdkRectangle rect;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (!gtk_widget_is_drawable (GTK_WIDGET (canvas)) || (bounds->x1 == bounds->x2))
-#else
-   if (!GTK_WIDGET_DRAWABLE (canvas) || (bounds->x1 == bounds->x2))
-#endif
+  if (!gtk_widget_is_drawable (GTK_WIDGET (canvas)) || (bounds->x1 == bounds->x2))
     return;
 
   /* We subtract one from the left & top edges, in case anti-aliasing makes
@@ -1886,11 +1854,7 @@ reconfigure_canvas (GooCanvas *canvas,
 
   canvas->freeze_count--;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (gtk_widget_get_realized (GTK_WIDGET (canvas)))
     {
       gdk_window_move_resize (canvas->canvas_window, window_x, window_y,
 			      window_width, window_height);
@@ -1974,12 +1938,8 @@ goo_canvas_size_allocate (GtkWidget     *widget,
 
   widget->allocation = *allocation;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (gtk_widget_get_realized (widget))
-#else
-   if (GTK_WIDGET_REALIZED (widget))
-#endif
-     {
+  if (gtk_widget_get_realized (widget))
+    {
       /* We can only allocate our children when we are realized, since we
 	 need a window to create a cairo_t which we use for layout. */
       tmp_list = canvas->widget_items;
@@ -2011,21 +1971,13 @@ goo_canvas_adjustment_value_changed (GtkAdjustment *adjustment,
   GooCanvasPrivate *priv = GOO_CANVAS_GET_PRIVATE (canvas);
   AtkObject *accessible;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (!canvas->freeze_count && gtk_widget_get_realized (GTK_WIDGET(canvas)))
-#else
-   if (!canvas->freeze_count && GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (!canvas->freeze_count && gtk_widget_get_realized (GTK_WIDGET(canvas)))
     {
       if (canvas->redraw_when_scrolled)
 	{
 	  /* Map the temporary window to stop the canvas window being scrolled.
 	     When it is unmapped the entire canvas will be redrawn. */
-#if GTK_CHECK_VERSION (2, 19, 6)
 	  if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
-#else
- 	  if (GTK_WIDGET_MAPPED (canvas))
-#endif
 	    gdk_window_show (canvas->tmp_window);
 	}
       else
@@ -2050,11 +2002,7 @@ goo_canvas_adjustment_value_changed (GtkAdjustment *adjustment,
 	{
 	  /* Unmap the temporary window, causing the entire canvas to be
 	     redrawn. */
-#if GTK_CHECK_VERSION (2, 19, 6)
 	  if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
-#else
- 	  if (GTK_WIDGET_MAPPED (canvas))
-#endif
 	    gdk_window_hide (canvas->tmp_window);
 	}
       else
@@ -2342,11 +2290,7 @@ goo_canvas_set_scale_internal	(GooCanvas *canvas,
      scrolling is unnecessary and really ugly.
      FIXME: There is a possible issue with keyboard focus/input methods here,
      since hidden windows can't have the keyboard focus. */
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_MAPPED (canvas))
-#endif
+  if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
     gdk_window_show (canvas->tmp_window);
 
   canvas->freeze_count++;
@@ -2368,11 +2312,7 @@ goo_canvas_set_scale_internal	(GooCanvas *canvas,
 
   /* Now hide the temporary window, so the canvas window will get an expose
      event. */
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
-#else
-   if (GTK_WIDGET_MAPPED (canvas))
-#endif
+  if (gtk_widget_get_mapped (GTK_WIDGET (canvas)))
     gdk_window_hide (canvas->tmp_window);
 }
 
@@ -2598,11 +2538,7 @@ goo_canvas_request_update (GooCanvas   *canvas)
   canvas->need_update = TRUE;
 
   /* We have to wait until we are realized. We'll do a full update then. */
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (!gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (!GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (!gtk_widget_get_realized (GTK_WIDGET (canvas)))
     return;
 
   /* We use a higher priority than the normal GTK+ resize/redraw idle handlers
@@ -2630,11 +2566,7 @@ goo_canvas_request_redraw (GooCanvas             *canvas,
 {
   GdkRectangle rect;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (!gtk_widget_is_drawable (GTK_WIDGET (canvas)) || (bounds->x1 == bounds->x2))
-#else
-   if (!GTK_WIDGET_DRAWABLE (canvas) || (bounds->x1 == bounds->x2))
-#endif
+  if (!gtk_widget_is_drawable (GTK_WIDGET (canvas)) || (bounds->x1 == bounds->x2))
     return;
 
   /* We subtract one from the left & top edges, in case anti-aliasing makes
@@ -2914,11 +2846,7 @@ propagate_event (GooCanvas     *canvas,
   gboolean stop_emission = FALSE, valid;
 
   /* Don't emit any events if the canvas is not realized. */
-#if GTK_CHECK_VERSION (2, 19, 6)
-   if (!gtk_widget_get_realized (GTK_WIDGET (canvas)))
-#else
-   if (!GTK_WIDGET_REALIZED (canvas))
-#endif
+  if (!gtk_widget_get_realized (GTK_WIDGET (canvas)))
     return FALSE;
 
   if (item)
@@ -3289,11 +3217,7 @@ goo_canvas_key_press       (GtkWidget      *widget,
 			    GdkEventKey    *event)
 {
   GooCanvas *canvas = GOO_CANVAS (widget);
-#if GTK_CHECK_VERSION (2, 19, 6)	
-   if (gtk_widget_has_focus (GTK_WIDGET (canvas)) && canvas->focused_item)
-#else
-   if (GTK_WIDGET_HAS_FOCUS (canvas) && canvas->focused_item)
-#endif 
+  if (gtk_widget_has_focus (GTK_WIDGET (canvas)) && canvas->focused_item)
     if (propagate_event (canvas, canvas->focused_item, "key_press_event",
 			 (GdkEvent*) event))
     return TRUE;
@@ -3308,11 +3232,7 @@ goo_canvas_key_release     (GtkWidget      *widget,
 {
   GooCanvas *canvas = GOO_CANVAS (widget);
 
-#if GTK_CHECK_VERSION (2, 19, 6)	
-   if (gtk_widget_has_focus (GTK_WIDGET (canvas)) && canvas->focused_item)
-#else
-   if (GTK_WIDGET_HAS_FOCUS (canvas) && canvas->focused_item)
-#endif
+  if (gtk_widget_has_focus (GTK_WIDGET (canvas)) && canvas->focused_item)
     if (propagate_event (canvas, canvas->focused_item, "key_release_event",
 			 (GdkEvent*) event))
     return TRUE;
@@ -4236,11 +4156,7 @@ goo_canvas_focus (GtkWidget        *widget,
   data.text_direction = gtk_widget_get_direction (widget);
   data.start_item = NULL;
 
-#if GTK_CHECK_VERSION (2, 19, 6)
   if (gtk_widget_has_focus (GTK_WIDGET (canvas)))
-#else
-  if (GTK_WIDGET_HAS_FOCUS (canvas)) 
-#endif
     data.start_item = canvas->focused_item;
   else if (old_focus_child && GOO_IS_CANVAS_WIDGET (old_focus_child))
     data.start_item = g_object_get_data (G_OBJECT (old_focus_child),
diff --git a/src/goocanvasatk.c b/src/goocanvasatk.c
index 4410e52..2abf2d0 100644
--- a/src/goocanvasatk.c
+++ b/src/goocanvasatk.c
@@ -418,13 +418,8 @@ goo_canvas_item_accessible_ref_state_set (AtkObject *accessible)
     {
       atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
 
-#if GTK_CHECK_VERSION(2, 19, 6)
-       if (gtk_widget_has_focus (GTK_WIDGET (canvas))
+      if (gtk_widget_has_focus (GTK_WIDGET (canvas))
 	  && canvas->focused_item == item)
-#else
-       if (GTK_WIDGET_HAS_FOCUS (canvas)
- 	  && canvas->focused_item == item)
-#endif
 	atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
     }
 
diff --git a/src/goocanvaswidget.c b/src/goocanvaswidget.c
index 4e18b7a..70adfc0 100644
--- a/src/goocanvaswidget.c
+++ b/src/goocanvaswidget.c
@@ -253,11 +253,7 @@ goo_canvas_widget_set_widget (GooCanvasWidget *witem,
 
       if (simple->canvas)
 	{
-#if GTK_CHECK_VERSION(2, 19, 6)
 	  if (gtk_widget_get_realized (GTK_WIDGET (simple->canvas)))
-#else
-	  if (GTK_WIDGET_REALIZED (simple->canvas))  
-#endif
 	    gtk_widget_set_parent_window (widget,
 					  simple->canvas->canvas_window);
 
@@ -386,11 +382,7 @@ goo_canvas_widget_set_canvas  (GooCanvasItem *item,
 
 	  if (witem->widget)
 	    {
-#if GTK_CHECK_VERSION(2, 19, 6)
 	      if (gtk_widget_get_realized (GTK_WIDGET (simple->canvas)))
-#else
- 	      if (GTK_WIDGET_REALIZED (simple->canvas))
-#endif
 		gtk_widget_set_parent_window (witem->widget,
 					      simple->canvas->canvas_window);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]