[gtkmm] Remove #ifdefs with obsolete GLIBMM_*_ENABLED constants

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 1dd410d6ab0fe8703f8af177f4543f59160b8f59
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri Dec 18 20:19:34 2015 +0100

    Remove #ifdefs with obsolete GLIBMM_*_ENABLED constants
    
    Remove remaining #ifdefs with GLIBMM_[EXCEPTIONS,PROPERTIES,VFUNCS]_ENABLED.

 gtk/src/cellarea.ccg     |   16 ----------------
 gtk/src/cellrenderer.ccg |   16 ----------------
 gtk/src/menubutton.ccg   |    2 --
 gtk/src/menubutton.hg    |    2 --
 gtk/src/range.ccg        |    9 ---------
 gtk/src/widget.ccg       |   20 --------------------
 gtk/src/window.ccg       |    2 --
 gtk/src/window.hg        |    2 --
 8 files changed, 0 insertions(+), 69 deletions(-)
---
diff --git a/gtk/src/cellarea.ccg b/gtk/src/cellarea.ccg
index c610775..089dd2b 100644
--- a/gtk/src/cellarea.ccg
+++ b/gtk/src/cellarea.ccg
@@ -94,10 +94,8 @@ void CellArea_Class::get_preferred_width_vfunc_callback(GtkCellArea* self, GtkCe
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -106,13 +104,11 @@ void CellArea_Class::get_preferred_width_vfunc_callback(GtkCellArea* self, GtkCe
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -140,10 +136,8 @@ void CellArea_Class::get_preferred_height_for_width_vfunc_callback(GtkCellArea*
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -152,13 +146,11 @@ void CellArea_Class::get_preferred_height_for_width_vfunc_callback(GtkCellArea*
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -186,10 +178,8 @@ void CellArea_Class::get_preferred_height_vfunc_callback(GtkCellArea* self, GtkC
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -198,13 +188,11 @@ void CellArea_Class::get_preferred_height_vfunc_callback(GtkCellArea* self, GtkC
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -232,10 +220,8 @@ void CellArea_Class::get_preferred_width_for_height_vfunc_callback(GtkCellArea*
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -244,13 +230,11 @@ void CellArea_Class::get_preferred_width_for_height_vfunc_callback(GtkCellArea*
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
diff --git a/gtk/src/cellrenderer.ccg b/gtk/src/cellrenderer.ccg
index 78d146e..51bb986 100644
--- a/gtk/src/cellrenderer.ccg
+++ b/gtk/src/cellrenderer.ccg
@@ -44,10 +44,8 @@ void CellRenderer_Class::get_preferred_width_vfunc_callback(GtkCellRenderer* sel
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -55,13 +53,11 @@ void CellRenderer_Class::get_preferred_width_vfunc_callback(GtkCellRenderer* sel
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -89,10 +85,8 @@ void CellRenderer_Class::get_preferred_height_for_width_vfunc_callback(GtkCellRe
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -100,13 +94,11 @@ void CellRenderer_Class::get_preferred_height_for_width_vfunc_callback(GtkCellRe
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -134,10 +126,8 @@ void CellRenderer_Class::get_preferred_height_vfunc_callback(GtkCellRenderer* se
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -145,13 +135,11 @@ void CellRenderer_Class::get_preferred_height_vfunc_callback(GtkCellRenderer* se
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -179,10 +167,8 @@ void CellRenderer_Class::get_preferred_width_for_height_vfunc_callback(GtkCellRe
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -190,13 +176,11 @@ void CellRenderer_Class::get_preferred_width_for_height_vfunc_callback(GtkCellRe
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
diff --git a/gtk/src/menubutton.ccg b/gtk/src/menubutton.ccg
index 2e5954d..a490c2f 100644
--- a/gtk/src/menubutton.ccg
+++ b/gtk/src/menubutton.ccg
@@ -43,7 +43,6 @@ void MenuButton::unset_menu_model()
 }
 
 #ifndef GTKMM_DISABLE_DEPRECATED
-#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Menu* > MenuButton::property_menu() 
 {
   return property_popup();
@@ -53,7 +52,6 @@ Glib::PropertyProxy_ReadOnly< Menu* > MenuButton::property_menu() const
 {
   return property_popup();
 }
-#endif //GLIBMM_PROPERTIES_ENABLED
 #endif // GTKMM_DISABLE_DEPRECATED
 
 } //namespace Gtk
diff --git a/gtk/src/menubutton.hg b/gtk/src/menubutton.hg
index d26dca2..da33fdf 100644
--- a/gtk/src/menubutton.hg
+++ b/gtk/src/menubutton.hg
@@ -96,7 +96,6 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(const Widget* get_align_widget() const, gtk_menu_button_get_align_widget)
 
 #ifndef GTKMM_DISABLE_DEPRECATED
-#ifdef GLIBMM_PROPERTIES_ENABLED
 // _WRAP_PROPERTY("menu", Menu*, deprecated "Use popup instead.")
 // The GtkMenuButton::menu property does not exist in gtk+ 3.7.0 and later. Must hand-code to avoid an 
API/ABI break.
 /** The dropdown menu.
@@ -116,7 +115,6 @@ _DEPRECATE_IFDEF_END
    * or receive notification when the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Menu* > property_menu() const;
-#endif //#GLIBMM_PROPERTIES_ENABLED
 #endif // GTKMM_DISABLE_DEPRECATED
 
   _WRAP_PROPERTY("popup", Menu*)
diff --git a/gtk/src/range.ccg b/gtk/src/range.ccg
index bca8255..44547d7 100644
--- a/gtk/src/range.ccg
+++ b/gtk/src/range.ccg
@@ -26,7 +26,6 @@ void Range::unset_adjustment()
   gtk_range_set_adjustment(gobj(), nullptr);
 }
 
-#ifdef GLIBMM_VFUNCS_ENABLED
 void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* border)
 {
   const auto obj_base = static_cast<Glib::ObjectBase*>(
@@ -42,22 +41,18 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         Gtk::Border cxx_border(border, true);
         obj->get_range_border_vfunc(cxx_border);
         *border = *(cxx_border.gobj());
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -70,7 +65,6 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor
     (*base->get_range_border)(self, border);
 
 }
-#endif //GLIBMM_VFUNCS_ENABLED
 
 Gdk::Rectangle Range::get_range_rect() const
 {
@@ -79,7 +73,4 @@ Gdk::Rectangle Range::get_range_rect() const
   return result;
 }
 
-
 } // namespace Gtk
-
-
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index 43c0c35..6840b50 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -132,20 +132,16 @@ void Widget_Class::hide_callback(GtkWidget* self)
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         obj->on_hide();
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -248,10 +244,8 @@ void Widget_Class::get_preferred_width_vfunc_callback(GtkWidget* self, gint* min
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -259,13 +253,11 @@ void Widget_Class::get_preferred_width_vfunc_callback(GtkWidget* self, gint* min
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -293,10 +285,8 @@ void Widget_Class::get_preferred_height_for_width_vfunc_callback(GtkWidget* self
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -304,13 +294,11 @@ void Widget_Class::get_preferred_height_for_width_vfunc_callback(GtkWidget* self
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -338,10 +326,8 @@ void Widget_Class::get_preferred_height_vfunc_callback(GtkWidget* self, gint* mi
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_height = 0;
         int nat_height = 0;
@@ -349,13 +335,11 @@ void Widget_Class::get_preferred_height_vfunc_callback(GtkWidget* self, gint* mi
              (minimum_height ? *minimum_height : min_height),
              (natural_height ? *natural_height : nat_height));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
@@ -383,10 +367,8 @@ void Widget_Class::get_preferred_width_for_height_vfunc_callback(GtkWidget* self
     const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
     if(obj) // This can be NULL during destruction.
     {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try // Trap C++ exceptions which would normally be lost because this is a C callback.
       {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
         int min_width = 0;
         int nat_width = 0;
@@ -394,13 +376,11 @@ void Widget_Class::get_preferred_width_for_height_vfunc_callback(GtkWidget* self
              (minimum_width ? *minimum_width : min_width),
              (natural_width ? *natural_width : nat_width));
         return;
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
       catch(...)
       {
         Glib::exception_handlers_invoke();
       }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
 
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 483bf53..5f8767e 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -204,7 +204,6 @@ void Window::unset_application()
 }
 
 #ifndef GTKMM_DISABLE_DEPRECATED
-#ifdef GLIBMM_PROPERTIES_ENABLED
 // This works. The base class GtkWidget contains the opacity property.
 Glib::PropertyProxy< double > Window::property_opacity() 
 {
@@ -215,7 +214,6 @@ Glib::PropertyProxy_ReadOnly< double > Window::property_opacity() const
 {
   return Glib::PropertyProxy_ReadOnly< double >(this, "opacity");
 }
-#endif //GLIBMM_PROPERTIES_ENABLED
 #endif // GTKMM_DISABLE_DEPRECATED
 
 } // namespace Gtk
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index b691272..fdd29b1 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -77,7 +77,6 @@ public:
   _WRAP_PROPERTY("transient_for", Window*)
 
 #ifndef GTKMM_DISABLE_DEPRECATED
-#ifdef GLIBMM_PROPERTIES_ENABLED
 // _WRAP_PROPERTY("opacity", double, deprecated "Use the opacity property in the Widget base class instead.")
 // The GtkWindow::opacity property does not exist in gtk+ 3.7.10 and later. Must hand-code to avoid an ABI 
break.
 /** The opacity of the window, from 0 to 1.
@@ -97,7 +96,6 @@ public:
    * or receive notification when the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< double > property_opacity() const;
-#endif //#GLIBMM_PROPERTIES_ENABLED
 #endif // GTKMM_DISABLE_DEPRECATED
 
   _WRAP_PROPERTY("has-resize-grip", bool, deprecated "Resize grips have been removed.")