[goocanvasmm: 2/3] Fix the build with the normal API again, and fix some whitespace.

[Murray Cumming <murrayc src gnome org>]

commit 3a704bead0aea3c5dd252539ed77565a646630af
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jul 5 20:50:48 2009 +0200

    Fix the build with the normal API again, and fix some whitespace.

 ChangeLog                                |    6 +-
 examples/coordinates/main.cc             |    6 +-
 examples/coordinates/window.cc           |    6 +-
 examples/custom_item/examplewindow.cc    |    6 +-
 examples/custom_item/main.cc             |    6 +-
 examples/demo/main.cc                    |    6 +-
 examples/demo/primitives.cc              |  235 +++++++++++++++---------------
 examples/demo/primitives.h               |   40 +++---
 examples/demo/window.cc                  |   14 +-
 examples/demo/window.h                   |    2 +-
 examples/drag_to_canvas/examplewindow.cc |    2 +-
 examples/drag_to_canvas/main.cc          |    6 +-
 examples/moving_shapes/main.cc           |    6 +-
 examples/moving_shapes/window.h          |   14 +-
 examples/simple/examplewindow.cc         |    2 +-
 examples/simple/examplewindow.h          |    2 +-
 examples/simple/main.cc                  |    6 +-
 examples/table/examplewindow.h           |    2 +-
 examples/tablemodel/examplewindow.cc     |    2 +-
 examples/tablemodel/examplewindow.h      |    2 +-
 examples/tablemodel/main.cc              |    6 +-
 examples/text/main.cc                    |    6 +-
 examples/text/window.cc                  |    6 +-
 tests/child_properties/main.cc           |    2 +-
 24 files changed, 198 insertions(+), 193 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a74d282..51404cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2009-07-05  Murray Cumming  <murrayc murrayc-x61>
+2009-07-05  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the normal API again, and fix some whitespace.
+
+2009-07-05  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with disabled 
 	exceptions and disabled properties API. It is not pretty. 
diff --git a/examples/coordinates/main.cc b/examples/coordinates/main.cc
index 75c776f..70da243 100644
--- a/examples/coordinates/main.cc
+++ b/examples/coordinates/main.cc
@@ -19,11 +19,11 @@
 
 int main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("example", "0.1", argc, argv);
 
   ExampleWindow win;
-  Gtk::Main::run(win) ;
+  Gtk::Main::run(win);
 
   return 0;
 }
diff --git a/examples/coordinates/window.cc b/examples/coordinates/window.cc
index 588b2c1..241df03 100644
--- a/examples/coordinates/window.cc
+++ b/examples/coordinates/window.cc
@@ -38,9 +38,9 @@ ExampleWindow::ExampleWindow()
   m_rect = Goocanvas::Rect::create(10, 10, 60, 60);
   root->add_child(m_rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
-  m_rect->property_line_width().set_value(10.0);
-  m_rect->property_stroke_color().set_value("yellow");
-  m_rect->property_fill_color().set_value("gray");
+  m_rect->property_line_width() = 10.0;
+  m_rect->property_stroke_color() = "yellow";
+  m_rect->property_fill_color() = "gray";
 #else
   m_rect->set_property("line_width", 10.0);
   m_rect->set_property("stroke_color", Glib::ustring("yellow"));
diff --git a/examples/custom_item/examplewindow.cc b/examples/custom_item/examplewindow.cc
index f1536a2..78bd37b 100644
--- a/examples/custom_item/examplewindow.cc
+++ b/examples/custom_item/examplewindow.cc
@@ -29,9 +29,9 @@ ExampleWindow::ExampleWindow()
 
   Glib::RefPtr<ExampleItem> item = ExampleItem::create(100, 100, 400, 400);
 #ifdef GLIBMM_PROPERTIES_ENABLED
-  item->property_line_width().set_value(10.0);
-  item->property_stroke_color().set_value("yellow");
-  item->property_fill_color().set_value("red");
+  item->property_line_width() = 10.0;
+  item->property_stroke_color() = "yellow";
+  item->property_fill_color() = "red";
 #else
   item->set_property("line_width", 10.0);
   item->set_property("stroke_color", Glib::ustring("yellow"));
diff --git a/examples/custom_item/main.cc b/examples/custom_item/main.cc
index 43f6c69..f8207a2 100644
--- a/examples/custom_item/main.cc
+++ b/examples/custom_item/main.cc
@@ -21,11 +21,11 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   ExampleWindow sw ;
-  Gtk::Main::run(sw) ;
+  Gtk::Main::run(sw);
 }
 
 
diff --git a/examples/demo/main.cc b/examples/demo/main.cc
index 2054bdd..7365cb9 100644
--- a/examples/demo/main.cc
+++ b/examples/demo/main.cc
@@ -23,10 +23,10 @@ int
 main(int argc, char* argv[])
 {
 
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   DemoWindow sw ;
-  Gtk::Main::run(sw) ;
+  Gtk::Main::run(sw);
 }
 
diff --git a/examples/demo/primitives.cc b/examples/demo/primitives.cc
index 859c989..f38d680 100644
--- a/examples/demo/primitives.cc
+++ b/examples/demo/primitives.cc
@@ -24,25 +24,25 @@
 Primitives::Primitives()
   : _name("Primitives")
 {
-  _vbox = Gtk::manage(new Gtk::VBox()) ;
+  _vbox = Gtk::manage(new Gtk::VBox());
 
-  Gtk::Label* lbl = Gtk::manage(new Gtk::Label("Drag an item with button 1. Click button 2 on an item to lower it, or button 3 to raise it.")) ;
-  _vbox->pack_start(*lbl, Gtk::PACK_SHRINK) ;
+  Gtk::Label* lbl = Gtk::manage(new Gtk::Label("Drag an item with button 1. Click button 2 on an item to lower it, or button 3 to raise it."));
+  _vbox->pack_start(*lbl, Gtk::PACK_SHRINK);
 
 
 //====
 
-  _canvas = Gtk::manage(new Goocanvas::Canvas()) ;
-  _setup_divisions() ;
-  _setup_rectangles() ;
-  _setup_ellipses() ;
-  _setup_texts() ;
-  _setup_images() ;
-  _setup_lines() ;
+  _canvas = Gtk::manage(new Goocanvas::Canvas());
+  _setup_divisions();
+  _setup_rectangles();
+  _setup_ellipses();
+  _setup_texts();
+  _setup_images();
+  _setup_lines();
 
-  _scrolled_window = Gtk::manage(new Gtk::ScrolledWindow()) ;
-  _scrolled_window->add(*_canvas) ;
-  _vbox->pack_start(*_scrolled_window, Gtk::PACK_EXPAND_WIDGET) ;
+  _scrolled_window = Gtk::manage(new Gtk::ScrolledWindow());
+  _scrolled_window->add(*_canvas);
+  _vbox->pack_start(*_scrolled_window, Gtk::PACK_EXPAND_WIDGET);
 
 //====
 }
@@ -87,9 +87,9 @@ Primitives::_on_motion_notify(const Glib::RefPtr<Goocanvas::Item>& item, GdkEven
 void
 Primitives::_setup_signals(const Glib::RefPtr<Goocanvas::Item>& item)
 {
-  item->signal_button_press_event().connect(sigc::mem_fun(*this, &Primitives::_on_button_press)) ;
-  item->signal_button_release_event().connect(sigc::mem_fun(*this, &Primitives::_on_button_release)) ;
-  item->signal_motion_notify_event().connect(sigc::mem_fun(*this, &Primitives::_on_motion_notify)) ;
+  item->signal_button_press_event().connect(sigc::mem_fun(*this, &Primitives::_on_button_press));
+  item->signal_button_release_event().connect(sigc::mem_fun(*this, &Primitives::_on_button_release));
+  item->signal_motion_notify_event().connect(sigc::mem_fun(*this, &Primitives::_on_motion_notify));
 }
 
 void
@@ -98,7 +98,7 @@ Primitives::_setup_heading(const Glib::ustring& heading, int pos)
   double x = (pos%3) * 200 + 100 ;
   double y = (pos/3) * 150 + 5 ;
 
-  Glib::RefPtr<Goocanvas::Text> text = Goocanvas::Text::create(heading, x, y, -1, Gtk::ANCHOR_N) ;
+  Glib::RefPtr<Goocanvas::Text> text = Goocanvas::Text::create(heading, x, y, -1, Gtk::ANCHOR_N);
   _canvas->get_root_item()->add_child(text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "Sans 12" ;
@@ -106,19 +106,19 @@ Primitives::_setup_heading(const Glib::ustring& heading, int pos)
   text->set_property("font", Glib::ustring("Sans 12"));
 #endif
 
-  text->skew_y(30, x, y) ;
+  text->skew_y(30, x, y);
 }
 
 void
 Primitives::_setup_divisions()
 {
-  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create() ;
+  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create();
   _canvas->get_root_item()->add_child(group);
-  group->translate(2, 2) ;
+  group->translate(2, 2);
 
   Glib::RefPtr<Goocanvas::ItemSimple> item ;
 
-  item = Goocanvas::Rect::create(0, 0, 600, 450) ;
+  item = Goocanvas::Rect::create(0, 0, 600, 450);
         group->add_child(item);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   item->property_line_width() = 4.0 ;
@@ -126,7 +126,7 @@ Primitives::_setup_divisions()
   item->set_property("line_width", 4.0);
 #endif
 
-  item = Goocanvas::Polyline::create(0, 150, 600, 150) ;
+  item = Goocanvas::Polyline::create(0, 150, 600, 150);
   group->add_child(item);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   item->property_line_width() = 4.0 ;
@@ -134,7 +134,7 @@ Primitives::_setup_divisions()
   item->set_property("line_width", 4.0);
 #endif
 
-  item = Goocanvas::Polyline::create(0, 300, 600, 300) ;
+  item = Goocanvas::Polyline::create(0, 300, 600, 300);
   group->add_child(item);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   item->property_line_width() = 4.0 ;
@@ -142,7 +142,7 @@ Primitives::_setup_divisions()
   item->set_property("line_width", 4.0);
 #endif
 
-  item = Goocanvas::Polyline::create(200, 0, 200, 450) ;
+  item = Goocanvas::Polyline::create(200, 0, 200, 450);
   group->add_child(item);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   item->property_line_width() = 4.0 ;
@@ -150,7 +150,7 @@ Primitives::_setup_divisions()
   item->set_property("line_width", 4.0);
 #endif
 
-  item = Goocanvas::Polyline::create(400, 0, 400, 450) ;
+  item = Goocanvas::Polyline::create(400, 0, 400, 450);
   group->add_child(item);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   item->property_line_width() = 4.0 ;
@@ -158,15 +158,15 @@ Primitives::_setup_divisions()
   item->set_property("line_width", 4.0);
 #endif
 
-  _setup_heading("Rectangles", 0) ;
-  _setup_heading("Ellipses", 1) ;
-  _setup_heading("Texts", 2) ;
-  _setup_heading("Images", 3) ;
-  _setup_heading("Lines", 4) ;
-  _setup_heading("No Curves", 5) ;
-  _setup_heading("Arcs", 6) ;
-  _setup_heading("Polygons", 7) ;
-  _setup_heading("Widgets", 8) ;
+  _setup_heading("Rectangles", 0);
+  _setup_heading("Ellipses", 1);
+  _setup_heading("Texts", 2);
+  _setup_heading("Images", 3);
+  _setup_heading("Lines", 4);
+  _setup_heading("No Curves", 5);
+  _setup_heading("Arcs", 6);
+  _setup_heading("Polygons", 7);
+  _setup_heading("Widgets", 8);
 }
 
 void
@@ -175,7 +175,7 @@ Primitives::_setup_rectangles()
   Glib::RefPtr<Goocanvas::Rect> rect ;
   Glib::RefPtr<Goocanvas::Item> root = _canvas->get_root_item();
 
-  rect = Goocanvas::Rect::create(20, 30, 50, 30) ;
+  rect = Goocanvas::Rect::create(20, 30, 50, 30);
   root->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_stroke_color() = "red" ;
@@ -184,13 +184,13 @@ Primitives::_setup_rectangles()
   rect->set_property("stroke_color", Glib::ustring("red"));
   rect->set_property("line_width", 8.0);
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 
-  rect = Goocanvas::Rect::create(90, 40, 90, 60) ;
+  rect = Goocanvas::Rect::create(90, 40, 90, 60);
   root->add_child(rect);
-  //rect->property_fill_pattern() = _create_stipple("mediumseagreen") ;
-  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("mediumseagreen") ;
-  g_object_set(rect->gobj(), "fill-pattern", p->cobj(), NULL) ;
+  //rect->property_fill_pattern() = _create_stipple("mediumseagreen");
+  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("mediumseagreen");
+  g_object_set(rect->gobj(), "fill-pattern", p->cobj(), NULL);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_stroke_color() = "black" ;
   rect->property_line_width() = 4.0 ;
@@ -198,18 +198,18 @@ Primitives::_setup_rectangles()
   rect->set_property("stroke_color", Glib::ustring("black"));
   rect->set_property("line_width", 4.0);
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 
-  rect = Goocanvas::Rect::create(10, 80, 70, 60) ;
+  rect = Goocanvas::Rect::create(10, 80, 70, 60);
   root->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_fill_color() = "steelblue" ;
 #else
   rect->set_property("fill_color", Glib::ustring("steelblue"));
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 
-  rect = Goocanvas::Rect::create(20, 90, 70, 60) ;
+  rect = Goocanvas::Rect::create(20, 90, 70, 60);
   root->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_fill_color_rgba() = 0x3cb37180 ;
@@ -220,9 +220,9 @@ Primitives::_setup_rectangles()
   rect->set_property("stroke_color", Glib::ustring("blue"));
   rect->set_property("line_width", 2.0);
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 
-  rect = Goocanvas::Rect::create(110, 80, 50, 30) ;
+  rect = Goocanvas::Rect::create(110, 80, 50, 30);
   root->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_radius_x() = 20.0 ;
@@ -235,16 +235,16 @@ Primitives::_setup_rectangles()
   rect->set_property("stroke_color", Glib::ustring("yellow"));
   rect->set_property("fill_color_rgba", 0x3cb3f180);
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 
-  rect = Goocanvas::Rect::create(30, 20, 50, 30) ;
+  rect = Goocanvas::Rect::create(30, 20, 50, 30);
   root->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_fill_color() = "yellow" ;
 #else
   rect->set_property("fill_color", Glib::ustring("yellow"));
 #endif
-  _setup_signals(rect) ;
+  _setup_signals(rect);
 }
 
 void
@@ -262,9 +262,9 @@ Primitives::_setup_ellipses()
   ellipse->set_property("stroke_color", Glib::ustring("goldenrod"));
   ellipse->set_property("line_width", 8.0);
 #endif
-  _setup_signals(ellipse) ;
+  _setup_signals(ellipse);
 
-  ellipse = Goocanvas::Ellipse::create(335, 70, 45, 30) ;
+  ellipse = Goocanvas::Ellipse::create(335, 70, 45, 30);
   root->add_child(ellipse);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   ellipse->property_fill_color() = "wheat" ;
@@ -277,13 +277,13 @@ Primitives::_setup_ellipses()
   ellipse->set_property("line_width", 4.0);
   ellipse->set_property("title", Glib::ustring("An ellipse"));
 #endif
-  _setup_signals(ellipse) ;
+  _setup_signals(ellipse);
 
-  ellipse = Goocanvas::Ellipse::create(245, 110, 35, 30) ;
+  ellipse = Goocanvas::Ellipse::create(245, 110, 35, 30);
   root->add_child(ellipse);
-  //ellipse->property_fill_pattern() = _create_stipple("cadetblue") ;
-  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("cadetblue") ;
-  g_object_set(ellipse->gobj(), "fill-pattern", p->cobj(), NULL) ;
+  //ellipse->property_fill_pattern() = _create_stipple("cadetblue");
+  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("cadetblue");
+  g_object_set(ellipse->gobj(), "fill-pattern", p->cobj(), NULL);
 
 #ifdef GLIBMM_PROPERTIES_ENABLED
   ellipse->property_stroke_color() = "black" ;
@@ -292,7 +292,7 @@ Primitives::_setup_ellipses()
   ellipse->set_property("stroke_color", Glib::ustring("black"));
   ellipse->set_property("line_width", 1.0);
 #endif
-  _setup_signals(ellipse) ;
+  _setup_signals(ellipse);
 }
 
 void
@@ -302,11 +302,11 @@ Primitives::_setup_texts()
         Glib::RefPtr<Goocanvas::Item> anchor;
 
   anchor = _create_anchor(420, 20);
-  text = Goocanvas::Text::create("Anchor NW", 0, 0, -1, Gtk::ANCHOR_NW) ;
+  text = Goocanvas::Text::create("Anchor NW", 0, 0, -1, Gtk::ANCHOR_NW);
   anchor->add_child(text);
-  //ellipse->property_fill_pattern() = _create_stipple("blue") ;
-  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("blue") ;
-  g_object_set(text->gobj(), "fill-pattern", p->cobj(), NULL) ;
+  //ellipse->property_fill_pattern() = _create_stipple("blue");
+  Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("blue");
+  g_object_set(text->gobj(), "fill-pattern", p->cobj(), NULL);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "Sans Bold 24" ;
   text->property_alignment() = Pango::ALIGN_CENTER ;
@@ -316,10 +316,10 @@ Primitives::_setup_texts()
   text->set_property("alignment", Pango::ALIGN_CENTER);
   text->set_property("fill_color", Glib::ustring("firebrick"));
 #endif
-  _setup_signals(text) ;
+  _setup_signals(text);
 
   anchor = _create_anchor(470, 75);
-  text = Goocanvas::Text::create("Anchor center\nJustify center\nMultiline text\n8bit text 'gibberish'", 0, 0, -1, Gtk::ANCHOR_CENTER) ;
+  text = Goocanvas::Text::create("Anchor center\nJustify center\nMultiline text\n8bit text 'gibberish'", 0, 0, -1, Gtk::ANCHOR_CENTER);
   anchor->add_child(text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "monospace bold 14" ;
@@ -330,12 +330,12 @@ Primitives::_setup_texts()
   text->set_property("alignment", Pango::ALIGN_CENTER);
   text->set_property("fill_color", Glib::ustring("firebrick"));
 #endif
-  _setup_signals(text) ;
+  _setup_signals(text);
 
   anchor = _create_anchor(420, 240);
   text = Goocanvas::Text::create(
     "This is a very long paragraph that will need to be wrapped over several lines so we can see what happens to line-breaking as the view is zoomed in and out.",
-    0, 0, 180, Gtk::ANCHOR_W) ;
+    0, 0, 180, Gtk::ANCHOR_W);
   anchor->add_child(text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "Sans 12" ;
@@ -344,9 +344,9 @@ Primitives::_setup_texts()
   text->set_property("font", Glib::ustring("Sans 12"));
   text->set_property("fill_color", Glib::ustring("goldenrod"));
 #endif
-  _setup_signals(text) ;
+  _setup_signals(text);
 
-  text = Goocanvas::Text::create("Ellipsized text.", 20, 420, 115, Gtk::ANCHOR_W) ;
+  text = Goocanvas::Text::create("Ellipsized text.", 20, 420, 115, Gtk::ANCHOR_W);
   _canvas->get_root_item()->add_child(text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "Sans 12" ;
@@ -357,34 +357,35 @@ Primitives::_setup_texts()
   text->set_property("fill_color", Glib::ustring("blue"));
   text->set_property("ellipsize", Pango::ELLIPSIZE_END);
 #endif
-  _setup_signals(text) ;
+  _setup_signals(text);
 }
 
 void
 Primitives::_setup_images()
 {
+  Glib::RefPtr<Gdk::Pixbuf> pb;
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    Glib::RefPtr<Gdk::Pixbuf> pb = Gdk::Pixbuf::create_from_file("toroid.png") ;
+    pb = Gdk::Pixbuf::create_from_file("toroid.png");
   }
   catch(...)
   {
-    g_warning("Couldn't find the toroid.png sample file.") ;
+    g_warning("Couldn't find the toroid.png sample file.");
   }
 #else
   std::auto_ptr<Glib::Error> error;
-  Glib::RefPtr<Gdk::Pixbuf> pb = Gdk::Pixbuf::create_from_file("toroid.png", error) ;
+  pb = Gdk::Pixbuf::create_from_file("toroid.png", error);
   if(error.get())
   {
-    g_warning("Couldn't find the toroid.png sample file.") ;
+    g_warning("Couldn't find the toroid.png sample file.");
   }
 #endif
 
-  double w = pb->get_width() ;
-  double h = pb->get_height() ;
+  double w = pb->get_width();
+  double h = pb->get_height();
 
-  Glib::RefPtr<Goocanvas::Image> img = Goocanvas::Image::create(pb, 100.0 - w / 2.0, 225.0 - h / 2.0) ;
+  Glib::RefPtr<Goocanvas::Image> img = Goocanvas::Image::create(pb, 100.0 - w / 2.0, 225.0 - h / 2.0);
   _canvas->get_root_item()->add_child(img);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   img->property_width() = w ;
@@ -393,34 +394,34 @@ Primitives::_setup_images()
   img->set_property("width", w);
   img->set_property("height", h);
 #endif
-  _setup_signals(img) ;
+  _setup_signals(img);
 
-  _create_flower(20.0, 170.0, Gtk::ANCHOR_NW) ;
-  _create_flower(180.0, 170.0, Gtk::ANCHOR_NE) ;
-  _create_flower(20.0, 280.0, Gtk::ANCHOR_SW) ;
-  _create_flower(180.0, 280.0, Gtk::ANCHOR_SE) ;
+  _create_flower(20.0, 170.0, Gtk::ANCHOR_NW);
+  _create_flower(180.0, 170.0, Gtk::ANCHOR_NE);
+  _create_flower(20.0, 280.0, Gtk::ANCHOR_SW);
+  _create_flower(180.0, 280.0, Gtk::ANCHOR_SE);
 }
 
 void
 Primitives::_setup_lines()
 {
-  _create_polish_diamond() ;
-  _create_hilbert() ;
+  _create_polish_diamond();
+  _create_hilbert();
 
   Glib::RefPtr<Goocanvas::Polyline> line ;
   Glib::RefPtr<Goocanvas::Item> root = _canvas->get_root_item();
 
 /*
-  Glib::RefPtr<Goocanvas::Points> points = Goocanvas::Points::create(4) ;
-  points->set_coordinate(0, 340, 170) ;
-  points->set_coordinate(1, 340, 230) ;
-  points->set_coordinate(2, 390, 230) ;
-  points->set_coordinate(3, 390, 170) ;
-  line = Goocanvas::Polyline::create(false, points) ; 
+  Glib::RefPtr<Goocanvas::Points> points = Goocanvas::Points::create(4);
+  points->set_coordinate(0, 340, 170);
+  points->set_coordinate(1, 340, 230);
+  points->set_coordinate(2, 390, 230);
+  points->set_coordinate(3, 390, 170);
+  line = Goocanvas::Polyline::create(false, points); 
         root->add_child(line);
 */
 
-  line = Goocanvas::Polyline::create(356, 180, 374, 220) ;
+  line = Goocanvas::Polyline::create(356, 180, 374, 220);
         root->add_child(line);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   line->property_stroke_color() = "blue" ;
@@ -439,9 +440,9 @@ Primitives::_setup_lines()
   line->set_property("arrow_length", 6.0);
   line->set_property("arrow_width", 6.0);
 #endif
-  _setup_signals(line) ;
+  _setup_signals(line);
 
-  line = Goocanvas::Polyline::create(356, 220, 374, 180) ;
+  line = Goocanvas::Polyline::create(356, 220, 374, 180);
         root->add_child(line);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   line->property_stroke_color() = "blue" ;
@@ -460,7 +461,7 @@ Primitives::_setup_lines()
   line->set_property("arrow_length", 6.0);
   line->set_property("arrow_width", 6.0);
 #endif
-  _setup_signals(line) ;
+  _setup_signals(line);
 }
 
 Cairo::RefPtr<Cairo::Pattern>
@@ -473,14 +474,14 @@ Primitives::_create_stipple(const Glib::ustring& color)
       0, 0, 0, 255
     };
 
-  Gdk::Color c(color) ;
+  Gdk::Color c(color);
   data[2] = data[14] = c.get_red() << 8 ;
   data[1] = data[13] = c.get_green() << 8 ;
   data[0] = data[12] = c.get_blue() << 8 ;
 
-  Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create(data, Cairo::FORMAT_ARGB32, 2, 2, 8) ;
-  Cairo::RefPtr<Cairo::SurfacePattern> pattern = Cairo::SurfacePattern::create(surface) ;
-  pattern->set_extend(Cairo::EXTEND_REPEAT) ;
+  Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create(data, Cairo::FORMAT_ARGB32, 2, 2, 8);
+  Cairo::RefPtr<Cairo::SurfacePattern> pattern = Cairo::SurfacePattern::create(surface);
+  pattern->set_extend(Cairo::EXTEND_REPEAT);
   return pattern ;
 }
 
@@ -489,13 +490,13 @@ Primitives::_create_anchor(double x, double y)
 {
   cairo_matrix_t m = { 0.8, 0.2, -0.3, 0.5, x, y };
 
-  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create() ;
+  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create();
   _canvas->get_root_item()->add_child(group);
-  group->translate(x, y) ;
+  group->translate(x, y);
   //group->property_transform() = &m ;
-  g_object_set(group->gobj(), "transform", &m, NULL) ;
+  g_object_set(group->gobj(), "transform", &m, NULL);
 
-  Glib::RefPtr<Goocanvas::Rect> rect = Goocanvas::Rect::create(-2.5, -2.5, 4, 4) ;
+  Glib::RefPtr<Goocanvas::Rect> rect = Goocanvas::Rect::create(-2.5, -2.5, 4, 4);
   group->add_child(rect);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_line_width() = 1.0 ;
@@ -503,7 +504,7 @@ Primitives::_create_anchor(double x, double y)
   rect->set_property("line_width", 1.0);
 #endif
 
-  _setup_signals(group) ;
+  _setup_signals(group);
 
   return group ;
 }
@@ -515,24 +516,24 @@ Primitives::_create_flower(double x, double y, Gtk::AnchorType anchor)
 
   try
   {
-    surface = Cairo::ImageSurface::create_from_png("flower.png") ;
+    surface = Cairo::ImageSurface::create_from_png("flower.png");
   }
 
   catch(...)
   {
-    g_warning("Couldn't find flower.png sample image.") ;
+    g_warning("Couldn't find flower.png sample image.");
     return ;
   }
 
-  double w = surface->get_width() ;
-  double h = surface->get_height() ;
+  double w = surface->get_width();
+  double h = surface->get_height();
 
-  Cairo::RefPtr<Cairo::SurfacePattern> pattern = Cairo::SurfacePattern::create(surface) ;
+  Cairo::RefPtr<Cairo::SurfacePattern> pattern = Cairo::SurfacePattern::create(surface);
 
-  Glib::RefPtr<Goocanvas::Image> img = Goocanvas::Image::create(x, y) ;
+  Glib::RefPtr<Goocanvas::Image> img = Goocanvas::Image::create(x, y);
    _canvas->get_root_item()->add_child(img);
   //TODO: img->property_pattern() = pattern ;
-  g_object_set(img->gobj(), "pattern", pattern->cobj(), NULL) ;
+  g_object_set(img->gobj(), "pattern", pattern->cobj(), NULL);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   img->property_width() = w ;
   img->property_height() = h ;
@@ -540,15 +541,15 @@ Primitives::_create_flower(double x, double y, Gtk::AnchorType anchor)
   img->set_property("width", w);
   img->set_property("height", h);
 #endif
-  _setup_signals(img) ;
+  _setup_signals(img);
 }
 
 void
 Primitives::_create_polish_diamond()
 {
-  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create() ;
+  Glib::RefPtr<Goocanvas::Group> group = Goocanvas::Group::create();
   _canvas->get_root_item()->add_child(group); 
-  group->translate(270, 230) ;
+  group->translate(270, 230);
 
   Glib::RefPtr<Goocanvas::Polyline> line ;
 
@@ -558,21 +559,21 @@ Primitives::_create_polish_diamond()
   for(int i = 0 ; i < vertices ; i++)
   {
     double a = 2.0 * M_PI * i / vertices ;
-    double x1 = radius * cos(a) ;
-    double y1 = radius * sin(a) ;
+    double x1 = radius * cos(a);
+    double y1 = radius * sin(a);
 
     for(int j = i + 1 ; j < vertices ; j++)
     {
       a = 2.0 * M_PI * j / vertices ;
-      double x2 = radius * cos(a) ;
-      double y2 = radius * sin(a) ;
+      double x2 = radius * cos(a);
+      double y2 = radius * sin(a);
 
-      line = Goocanvas::Polyline::create(x1, y1, x2, y2) ;
+      line = Goocanvas::Polyline::create(x1, y1, x2, y2);
       group->add_child(line);
     }
   }
 
-  _setup_signals(group) ;
+  _setup_signals(group);
 }
 
 void
diff --git a/examples/demo/primitives.h b/examples/demo/primitives.h
index b444b28..9556d7b 100644
--- a/examples/demo/primitives.h
+++ b/examples/demo/primitives.h
@@ -29,39 +29,39 @@
 class Primitives : public Page
 {
 public:
-  Primitives() ;
+  Primitives();
 
   virtual const Glib::ustring&
-  getName() ;
+  getName();
 
   virtual Gtk::Widget*
-  getWidget() ;
+  getWidget();
 
 private:
 
-  bool      _on_background_button_press(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev) ;
-  bool      _on_button_press(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev) ;
-  bool      _on_button_release(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev) ;
-  bool      _on_motion_notify(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventMotion* ev) ;
+  bool      _on_background_button_press(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev);
+  bool      _on_button_press(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev);
+  bool      _on_button_release(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* ev);
+  bool      _on_motion_notify(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventMotion* ev);
 
-  void      _setup_signals(const Glib::RefPtr<Goocanvas::Item>& item) ;
-  void      _setup_heading(const Glib::ustring& heading, int pos) ;
-  void      _setup_divisions() ;
-  void      _setup_rectangles() ;
-  void      _setup_ellipses() ;
-  void      _setup_texts() ;
-  void      _setup_images() ;
-  void      _setup_lines() ;
+  void      _setup_signals(const Glib::RefPtr<Goocanvas::Item>& item);
+  void      _setup_heading(const Glib::ustring& heading, int pos);
+  void      _setup_divisions();
+  void      _setup_rectangles();
+  void      _setup_ellipses();
+  void      _setup_texts();
+  void      _setup_images();
+  void      _setup_lines();
 
   Cairo::RefPtr<Cairo::Pattern>
-        _create_stipple(const Glib::ustring& color) ;
+        _create_stipple(const Glib::ustring& color);
 
   Glib::RefPtr<Goocanvas::Item>
-        _create_anchor(double x, double y) ;
+        _create_anchor(double x, double y);
 
-  void      _create_flower(double x, double y, Gtk::AnchorType anchor) ;
-  void      _create_polish_diamond() ;
-  void      _create_hilbert() ;
+  void      _create_flower(double x, double y, Gtk::AnchorType anchor);
+  void      _create_polish_diamond();
+  void      _create_hilbert();
 
   Glib::ustring    _name ;
   Gtk::VBox*    _vbox ;
diff --git a/examples/demo/window.cc b/examples/demo/window.cc
index 045a7d5..4be0c8c 100644
--- a/examples/demo/window.cc
+++ b/examples/demo/window.cc
@@ -20,22 +20,22 @@
 
 DemoWindow::DemoWindow()
 {
-  set_title("goocanvasmm Demo") ;
-  set_default_size(640, 600) ;
+  set_title("goocanvasmm Demo");
+  set_default_size(640, 600);
 
-  _pages.push_back(new Primitives()) ;
+  _pages.push_back(new Primitives());
 
 
   Gtk::Notebook* nb = Gtk::manage(new Gtk::Notebook());
 
   std::vector< Page* >::iterator iter ;
-  for(iter = _pages.begin() ; iter != _pages.end() ; iter++)
+  for(iter = _pages.begin(); iter != _pages.end(); iter++)
   {
     Page* p = *iter ;
-    nb->append_page(*(p->getWidget()), p->getName()) ;
+    nb->append_page(*(p->getWidget()), p->getName());
   }
 
-  add(*nb) ;
-  show_all_children() ;
+  add(*nb);
+  show_all_children();
 }
 
diff --git a/examples/demo/window.h b/examples/demo/window.h
index 4a31f92..a1620c9 100644
--- a/examples/demo/window.h
+++ b/examples/demo/window.h
@@ -26,7 +26,7 @@ class DemoWindow : public Gtk::Window
 {
 public:
 
-  DemoWindow() ;
+  DemoWindow();
 
 private:
 
diff --git a/examples/drag_to_canvas/examplewindow.cc b/examples/drag_to_canvas/examplewindow.cc
index 17767ef..078bd5a 100644
--- a/examples/drag_to_canvas/examplewindow.cc
+++ b/examples/drag_to_canvas/examplewindow.cc
@@ -201,7 +201,7 @@ Glib::RefPtr<Goocanvas::Item> ExampleWindow::create_canvas_item(DragItem drag_it
     Glib::RefPtr<Goocanvas::Rect> rect = Goocanvas::Rect::create(0, 0, 20, 20);
 #ifdef GLIBMM_PROPERTIES_ENABLED
     rect->property_line_width() = 10.0;
-    rect->property_stroke_color() = "yellow");
+    rect->property_stroke_color() = "yellow";
     rect->property_fill_color() = "red";
 #else
     rect->set_property("line_width", 10.0);
diff --git a/examples/drag_to_canvas/main.cc b/examples/drag_to_canvas/main.cc
index 43f6c69..f8207a2 100644
--- a/examples/drag_to_canvas/main.cc
+++ b/examples/drag_to_canvas/main.cc
@@ -21,11 +21,11 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   ExampleWindow sw ;
-  Gtk::Main::run(sw) ;
+  Gtk::Main::run(sw);
 }
 
 
diff --git a/examples/moving_shapes/main.cc b/examples/moving_shapes/main.cc
index f3595ea..0cf8efe 100644
--- a/examples/moving_shapes/main.cc
+++ b/examples/moving_shapes/main.cc
@@ -20,11 +20,11 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   Window w ;
-  Gtk::Main::run(w) ;
+  Gtk::Main::run(w);
 }
 
 
diff --git a/examples/moving_shapes/window.h b/examples/moving_shapes/window.h
index 0d68c38..679106c 100644
--- a/examples/moving_shapes/window.h
+++ b/examples/moving_shapes/window.h
@@ -24,7 +24,7 @@
 class Window : public Gtk::Window
 {
 public:
-  Window() ;
+  Window();
 
 private:
 
@@ -34,13 +34,13 @@ private:
   int _drag_x ;
   int _drag_y ;
 
-  void on_item_created(const Glib::RefPtr<Goocanvas::Item>& item, const Glib::RefPtr<Goocanvas::ItemModel>& model) ;
-  bool on_item_button_press_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* event) ;
-  bool on_item_button_release_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* event) ;
-  bool on_item_motion_notify_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventMotion* event) ;
+  void on_item_created(const Glib::RefPtr<Goocanvas::Item>& item, const Glib::RefPtr<Goocanvas::ItemModel>& model);
+  bool on_item_button_press_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* event);
+  bool on_item_button_release_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventButton* event);
+  bool on_item_motion_notify_event(const Glib::RefPtr<Goocanvas::Item>& item, GdkEventMotion* event);
 /*
-  bool on_focus_in_event(const Glib::RefPtr<Goocanvas::Item>& view, GdkEventFocus* event) ;
-  bool on_focus_out_event(const Glib::RefPtr<Goocanvas::Item>& view, GdkEventFocus* event) ;
+  bool on_focus_in_event(const Glib::RefPtr<Goocanvas::Item>& view, GdkEventFocus* event);
+  bool on_focus_out_event(const Glib::RefPtr<Goocanvas::Item>& view, GdkEventFocus* event);
 */
 };
 
diff --git a/examples/simple/examplewindow.cc b/examples/simple/examplewindow.cc
index 658120c..59975e4 100644
--- a/examples/simple/examplewindow.cc
+++ b/examples/simple/examplewindow.cc
@@ -49,7 +49,7 @@ ExampleWindow::ExampleWindow()
   Glib::RefPtr<Goocanvas::Text> text = Goocanvas::Text::create("Hello World", 300, 300, -1, Gtk::ANCHOR_CENTER);
   root->add_child(text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
-  text->property_font() = "Sans 24");
+  text->property_font() = "Sans 24";
 #else
   text->set_property("font=", Glib::ustring("Sans 24"));
 #endif //GLIBMM_PROPERTIES_ENABLED
diff --git a/examples/simple/examplewindow.h b/examples/simple/examplewindow.h
index f96a231..7cebda0 100644
--- a/examples/simple/examplewindow.h
+++ b/examples/simple/examplewindow.h
@@ -24,7 +24,7 @@
 class ExampleWindow : public Gtk::Window
 {
 public:
-  ExampleWindow() ;
+  ExampleWindow();
 
 protected:
 
diff --git a/examples/simple/main.cc b/examples/simple/main.cc
index 43f6c69..f8207a2 100644
--- a/examples/simple/main.cc
+++ b/examples/simple/main.cc
@@ -21,11 +21,11 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   ExampleWindow sw ;
-  Gtk::Main::run(sw) ;
+  Gtk::Main::run(sw);
 }
 
 
diff --git a/examples/table/examplewindow.h b/examples/table/examplewindow.h
index 8633356..67a7877 100644
--- a/examples/table/examplewindow.h
+++ b/examples/table/examplewindow.h
@@ -24,7 +24,7 @@
 class ExampleWindow : public Gtk::Window
 {
 public:
-  ExampleWindow() ;
+  ExampleWindow();
 
 protected:
 
diff --git a/examples/tablemodel/examplewindow.cc b/examples/tablemodel/examplewindow.cc
index 2503408..a274df3 100644
--- a/examples/tablemodel/examplewindow.cc
+++ b/examples/tablemodel/examplewindow.cc
@@ -30,7 +30,7 @@ ExampleWindow::ExampleWindow()
   m_second_canvas.set_size_request(640, 240);
   m_second_canvas.set_bounds(0, 0, 500, 500);
 
-  Glib::RefPtr<Goocanvas::ItemModel> root = Goocanvas::GroupModel::create() ;
+  Glib::RefPtr<Goocanvas::ItemModel> root = Goocanvas::GroupModel::create();
   m_first_canvas.set_root_item_model(root);
   m_second_canvas.set_root_item_model(root);
 
diff --git a/examples/tablemodel/examplewindow.h b/examples/tablemodel/examplewindow.h
index 2cc4d01..0f54def 100644
--- a/examples/tablemodel/examplewindow.h
+++ b/examples/tablemodel/examplewindow.h
@@ -24,7 +24,7 @@
 class ExampleWindow : public Gtk::Window
 {
 public:
-  ExampleWindow() ;
+  ExampleWindow();
 
 protected:
 
diff --git a/examples/tablemodel/main.cc b/examples/tablemodel/main.cc
index 43f6c69..f8207a2 100644
--- a/examples/tablemodel/main.cc
+++ b/examples/tablemodel/main.cc
@@ -21,11 +21,11 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   ExampleWindow sw ;
-  Gtk::Main::run(sw) ;
+  Gtk::Main::run(sw);
 }
 
 
diff --git a/examples/text/main.cc b/examples/text/main.cc
index 75c776f..70da243 100644
--- a/examples/text/main.cc
+++ b/examples/text/main.cc
@@ -19,11 +19,11 @@
 
 int main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
-  Goocanvas::init("example", "0.1", argc, argv) ;
+  Gtk::Main app(&argc, &argv);
+  Goocanvas::init("example", "0.1", argc, argv);
 
   ExampleWindow win;
-  Gtk::Main::run(win) ;
+  Gtk::Main::run(win);
 
   return 0;
 }
diff --git a/examples/text/window.cc b/examples/text/window.cc
index 8ae4a60..cb61511 100644
--- a/examples/text/window.cc
+++ b/examples/text/window.cc
@@ -48,9 +48,9 @@ ExampleWindow::ExampleWindow()
   root->add_child(m_text);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   m_text->property_font() = "Sans 9";
-  m_text->property_line_width().set_value(10.0);
-  m_text->property_stroke_color().set_value("yellow");
-  m_text->property_fill_color().set_value("gray");
+  m_text->property_line_width() = 10.0;
+  m_text->property_stroke_color() = "yellow";
+  m_text->property_fill_color() = "gray";
 #else
   m_text->set_property("font", Glib::ustring("Sans 9"));
   m_text->set_property("line_width", 10.0);
diff --git a/tests/child_properties/main.cc b/tests/child_properties/main.cc
index fd2c130..f45936d 100644
--- a/tests/child_properties/main.cc
+++ b/tests/child_properties/main.cc
@@ -22,7 +22,7 @@
 int
 main(int argc, char* argv[])
 {
-  Gtk::Main app(&argc, &argv) ;
+  Gtk::Main app(&argc, &argv);
   Goocanvas::init("goocanvasmm Simple Example", "0.1", argc, argv);
 
   Glib::RefPtr<Goocanvas::Table> table = Goocanvas::Table::create();