[glom/gtktoolpallete] Fix the build with fatal warnings.



commit 81ad84038f0038c2e511495fcac9208b12ee1c84
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Dec 30 09:56:28 2009 +0100

    Fix the build with fatal warnings.
    
    * glom/libglom/connectionpool.cc:
    * glom/utility_widgets/flowtable_dnd.cc:
    * glom/utility_widgets/layouttoolbar.cc:
    * glom/utility_widgets/placeholder-glom.cc: Avoid unused parameters.

 ChangeLog                                |   11 ++++++++++-
 glom/libglom/connectionpool.cc           |    2 +-
 glom/utility_widgets/flowtable_dnd.cc    |   10 +++++-----
 glom/utility_widgets/layouttoolbar.cc    |    4 ----
 glom/utility_widgets/placeholder-glom.cc |    2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01d2587..99666ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
+2009-12-30  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with fatal warnings.
+
+	* glom/libglom/connectionpool.cc:
+	* glom/utility_widgets/flowtable_dnd.cc:
+	* glom/utility_widgets/layouttoolbar.cc:
+	* glom/utility_widgets/placeholder-glom.cc: Avoid unused parameters.
+
 2009-12-28  Murray Cumming  <murrayc murrayc com>
 
-  Print Layouts: Avoid crash when closing the editing window.
+	Print Layouts: Avoid crash when closing the editing window.
   
 	* glom/print_layout/canvas_print_layout.cc: get_print_layout():
 	Avoid a crash when m_page_setup is null, though we need to find out why it 
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index 4548688..949fac9 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -535,7 +535,7 @@ bool ConnectionPool::startup(const SlotProgress& slot_progress, bool network_sha
 
   //If we crash while running (unlikely, hopefully), then try to cleanup.
   //Comment this out if you want to see the backtrace in a debugger.
-  //previous_sig_handler = signal(SIGSEGV, &on_linux_signal);
+  previous_sig_handler = signal(SIGSEGV, &on_linux_signal);
 
   return true;
 }
diff --git a/glom/utility_widgets/flowtable_dnd.cc b/glom/utility_widgets/flowtable_dnd.cc
index de1cc76..62c0e1b 100644
--- a/glom/utility_widgets/flowtable_dnd.cc
+++ b/glom/utility_widgets/flowtable_dnd.cc
@@ -151,20 +151,20 @@ bool FlowTableDnd::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& /* drag_
   return false;
 }
 
-void FlowTableDnd::on_dnd_add_layout_item_by_type(int item_type, Gtk::Widget* above)
+void FlowTableDnd::on_dnd_add_layout_item_by_type(int /* item_type */, Gtk::Widget* /* above */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_layout_item_by_type(): Not implemented. Derived classes should implement this." << std::endl;
 }
 
-void FlowTableDnd::on_dnd_add_layout_item(LayoutWidgetBase* above, const sharedptr<LayoutItem>& item)
+void FlowTableDnd::on_dnd_add_layout_item(LayoutWidgetBase* /* above */, const sharedptr<LayoutItem>& /* item */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_layout_item(): Not implemented. Derived classes should implement this." << std::endl;
 
 }
 
-void FlowTableDnd::on_dnd_add_placeholder(Gtk::Widget* above)
+void FlowTableDnd::on_dnd_add_placeholder(Gtk::Widget* /* above */)
 {
   //This is not pure virtual, so we can easily use this base class in unit tests.
   std::cerr << "FlowTableDnd::on_dnd_add_placeholder(): Not implemented. Derived classes should implement this." << std::endl;
@@ -422,12 +422,12 @@ void FlowTableDnd::on_child_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&
                       sizeof(gpointer*));
 }
 
-void FlowTableDnd::set_child_widget_dnd_in_progress(Gtk::Widget* child, bool in_progress)
+void FlowTableDnd::set_child_widget_dnd_in_progress(Gtk::Widget* /* child */, bool /* in_progress */)
 {
   //To be reimplemented by derived classes.
 }
 
-bool FlowTableDnd::get_child_widget_dnd_in_progress(Gtk::Widget* child) const
+bool FlowTableDnd::get_child_widget_dnd_in_progress(Gtk::Widget* /* child */) const
 {
   //To be reimplemented by derived classes.
   return false;
diff --git a/glom/utility_widgets/layouttoolbar.cc b/glom/utility_widgets/layouttoolbar.cc
index a2b0901..16ad936 100644
--- a/glom/utility_widgets/layouttoolbar.cc
+++ b/glom/utility_widgets/layouttoolbar.cc
@@ -67,10 +67,6 @@ LayoutToolbar::LayoutToolbar()
   // Looks ugly otherwise:
   set_size_request(100, 200);
 
-  LayoutToolbarButton* drag_image = 
-    Gtk::manage(new LayoutToolbarButton("glom-image.png", LayoutWidgetBase::TYPE_IMAGE,
-                                        _("Image"), _("Drag this to the layout to add a new static image.")));
-
   //TODO: Add a drag item for the related records item.
   
   //Note for translators: These are container layout items, containing child layout items, like container widgets in GTK+.
diff --git a/glom/utility_widgets/placeholder-glom.cc b/glom/utility_widgets/placeholder-glom.cc
index 9688bb6..2ea1455 100644
--- a/glom/utility_widgets/placeholder-glom.cc
+++ b/glom/utility_widgets/placeholder-glom.cc
@@ -52,7 +52,7 @@ PlaceholderGlom::~PlaceholderGlom()
 
 App_Glom* PlaceholderGlom::get_application()
 {
-  Gtk::Container* pWindow = get_toplevel();
+  //Gtk::Container* pWindow = get_toplevel();
   //TODO: This only works when the child widget is already in its parent.
 
   return 0; //dynamic_cast<App_Glom*>(pWindow);



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