[glom] Fix the build when -fno-exceptions



commit 7b58ecc0c6faea73f825078b09b2cd2ac547da45
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Sep 5 00:35:34 2009 +0200

    Fix the build when -fno-exceptions
    is used.

 ChangeLog                                |    6 ++++++
 glom/print_layout/canvas_print_layout.cc |    4 ++++
 glom/utility_widgets/imageglom.cc        |    2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d017caf..15a2696 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-05  Murray Cumming  <murrayc murrayc com>
 
+	* glom/print_layout/canvas_print_layout.cc:
+	* glom/utility_widgets/imageglom.cc: Fix the build when -fno-exceptions 
+	is used.
+
+2009-09-05  Murray Cumming  <murrayc murrayc com>
+
 	Added dlopen test of the python library.
 
 	* glom/libglom/test_connectionpool.cc:
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index b4a0de9..5894480 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -638,9 +638,12 @@ void Canvas_PrintLayout::fill_with_data(const Glib::RefPtr<Goocanvas::Group>& ca
   
   bool records_found = false;
   Glib::RefPtr<Gnome::Gda::DataModel> datamodel;
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED //TODO: Catch the error somehow?
   try
   {
+  #endif
     datamodel = query_execute_select(sql_query);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(const Glib::Exception& ex)
   {
@@ -650,6 +653,7 @@ void Canvas_PrintLayout::fill_with_data(const Glib::RefPtr<Goocanvas::Group>& ca
   {
     std::cout << "Canvas_PrintLayout::fill_with_data: exception: " << ex.what() << std::endl;
   }
+  #endif
 
   if(datamodel)
   {
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 3442715..4e90ac7 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -139,6 +139,8 @@ bool ImageGlom::on_button_press_event(GdkEventButton *event)
 
 #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   return Gtk::EventBox::on_button_press_event(event);
+#else
+  return false;
 #endif // GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]