[gtkmm] Put the usual ifdefs around the newly

[Murray Cumming <murrayc src gnome org>]

commit f0455a88be59e1b3bc7f894de17ba68d84950bd5
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Sep 6 18:09:13 2009 +0200

    Put the usual ifdefs around the newly
    deprecated methods.

 ChangeLog          |    5 +++++
 gtk/src/widget.ccg |    2 ++
 gtk/src/widget.hg  |   23 +++++++++++++----------
 3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2296ea5..60ccaa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-09-06  Murray Cumming  <murrayc murrayc com>
 
+	* gtk/src/widget.[hg|ccg]: Put the usual ifdefs around the newly 
+	deprecated methods.
+
+2009-09-06  Murray Cumming  <murrayc murrayc com>
+
 	Added new getters and a setter.
 
 	* gtk/src/gtk_methods.defs: Regenerated.
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index f9e6b7e..b03b752 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -287,6 +287,7 @@ bool Widget::is_realized() const
 bool Widget::is_mapped() const
   { return GTK_WIDGET_MAPPED(gobj()); }
 
+_DEPRECATE_IFDEF_START
 //deprecated:
 bool Widget::is_drawable() const
 {
@@ -320,6 +321,7 @@ bool Widget::app_paintable() const
 //deprecated:
 bool Widget::double_buffered() const
   { return get_double_buffered(); }
+_DEPRECATE_IFDEF_END
 
 Allocation Widget::get_allocation() const
 {
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 33fd002..41ac60c 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -589,11 +589,7 @@ public:
   
   /* FLAGS */
 
-  /** @deprecated: Use get_is_toplevel() instead.
-   */
-  bool is_toplevel() const;
-
-  //: Returns property {flags.nowindow}.
+ //: Returns property {flags.nowindow}.
   bool has_no_window() const;
 
   //: Returns property {flags.realized}.
@@ -602,6 +598,11 @@ public:
   //: Returns property {flags.mapped}.
   bool is_mapped() const;
 
+_DEPRECATE_IFDEF_START
+  /** @deprecated: Use get_is_toplevel() instead.
+   */
+  bool is_toplevel() const;
+
   /** @deprecated: Use get_is_drawable() instead.
    */
   bool is_drawable() const;
@@ -614,15 +615,10 @@ public:
    */
   bool sensitive() const;
 
-  bool parent_sensitive() const;
-
   /** @deprecated: Use get_can_default() instead.
    */
   bool can_default() const;
 
-  bool rc_style() const;
-  bool is_composite_child() const;
-
   /** @deprecated: Use get_app_paintable() instead.
    */
   bool app_paintable() const;
@@ -635,6 +631,13 @@ public:
    */
   bool double_buffered() const;
 
+_DEPRECATE_IFDEF_END
+
+  bool parent_sensitive() const;
+
+  bool rc_style() const;
+  bool is_composite_child() const;
+
   WidgetFlags get_flags() const;
   void set_flags(WidgetFlags flags);
   void unset_flags(WidgetFlags flags);