GNOME.org
 

[gtkmm/gtkmm-3maybe: 5/5] Merged from master

commit 50c67cd90033c7461b5d14d4a1aaeb5fd0703718
Merge: 34d5b5a 10639e4
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Mar 16 12:59:52 2010 +0100

    Merged from master

 ChangeLog                     |   52 +++++++++++++++++++++++++++++++++++++++++
 configure.ac                  |    2 +-
 gtk/gtkmm/radiobuttongroup.cc |    2 +-
 gtk/src/bin.ccg               |   18 +++++++-------
 gtk/src/bin.hg                |   26 ++++++++-----------
 gtk/src/box.ccg               |    6 ++--
 gtk/src/box.hg                |   15 ++++++++----
 gtk/src/buttonbox.ccg         |    4 +-
 gtk/src/buttonbox.hg          |   24 ++++--------------
 gtk/src/colorselection.ccg    |    1 -
 gtk/src/colorselection.hg     |   10 ++-----
 gtk/src/entrybuffer.hg        |    2 +-
 gtk/src/fontselection.hg      |   28 ++++++++++-----------
 gtk/src/handlebox.ccg         |   18 +-------------
 gtk/src/handlebox.hg          |   16 +++---------
 gtk/src/menushell.hg          |   15 ++++++++----
 gtk/src/messagedialog.ccg     |   13 ++++-----
 gtk/src/notebook.hg           |    9 +++++++
 gtk/src/offscreenwindow.hg    |    3 --
 gtk/src/printer.hg            |   14 +++++-----
 gtk/src/range.hg              |    2 +-
 gtk/src/ruler.ccg             |   16 +-----------
 gtk/src/ruler.hg              |   15 ++++--------
 gtk/src/scrolledwindow.hg     |    9 +-----
 gtk/src/selectiondata.ccg     |    7 +++--
 gtk/src/table.hg              |    9 +++++-
 gtk/src/tearoffmenuitem.ccg   |    5 ----
 gtk/src/tearoffmenuitem.hg    |    5 +---
 gtk/src/textview.hg           |   14 +++++-----
 gtk/src/toolpalette.hg        |   23 ++++++++---------
 gtk/src/treeview.hg           |    2 +-
 gtk/src/viewport.hg           |    8 ++++--
 gtk/src/widget.ccg            |   34 +++++---------------------
 gtk/src/widget.hg             |   46 +++++++++++-------------------------
 gtk/src/window.ccg            |   23 ++++++-----------
 gtk/src/window.hg             |   41 ++++++++++++++------------------
 36 files changed, 241 insertions(+), 296 deletions(-)
---
diff --cc gtk/src/box.hg
index a1aeeeb,66137cb..6441911
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@@ -20,8 -20,13 +20,14 @@@
  _DEFS(gtkmm,gtk)
  _PINCLUDE(gtkmm/private/container_p.h)
  
+ #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to use the ->children struct field.
 -//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
++//Allow us to set the struct fields.
++//TODO: We probably need to remove the STL-style children() API.
+ #undef GSEAL_ENABLE
+ #m4 _POP()
+ 
  #include <gtkmm/container.h>
 +#include <gtkmm/orientable.h>
  #include <glibmm/helperlist.h>
  #include <gtk/gtk.h>  /* For _GtkBoxChild */
  
diff --cc gtk/src/buttonbox.ccg
index e4fc0f8,36a7549..d3781a7
--- a/gtk/src/buttonbox.ccg
+++ b/gtk/src/buttonbox.ccg
@@@ -41,5 -41,57 +41,5 @@@ HButtonBox::HButtonBox(ButtonBoxStyle l
    set_spacing(spacing);
  }
  
- } // namespace Gtk
  
 -int ButtonBox::get_child_min_width() const
 -{
 -  int result = 0;
 -  gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-min-width", &result, (void*)0);
 -  return result;
 -}
 -
 -void ButtonBox::set_child_min_width(const int& value)
 -{
 -  //TODO: Find a way to set style properties in code, though this is deprecate anyway:
 -  gobj()->child_min_width = value;
 -}
 -
 -int ButtonBox::get_child_min_height() const
 -{
 -  int result = 0;
 -  gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-min-width", &result, (void*)0);
 -  return result;
 -}
 -
 -void ButtonBox::set_child_min_height(const int& value)
 -{
 -  //TODO: Find a way to set style properties in code, though this is deprecate anyway:
 -  gobj()->child_min_height = value;
 -}
 -
 -int ButtonBox::get_child_ipadding_x() const
 -{
 -  int result = 0;
 -  gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-internal-padding-x", &result, (void*)0);
 -  return result;
 -}
 -
 -void ButtonBox::set_child_ipadding_x(const int& value)
 -{
 -  //TODO: Find a way to set style properties in code, though this is deprecate anyway:
 -  gobj()->child_ipad_x = value;
 -}
 -
 -int ButtonBox::get_child_ipadding_y() const
 -{
 -  int result = 0;
 -  gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-internal-padding-y", &result, (void*)0);
 -  return result;
 -}
 -
 -void ButtonBox::set_child_ipadding_y(const int& value)
 -{
 -  //TODO: Find a way to set style properties in code, though this is deprecate anyway:
 -  gobj()->child_ipad_y = value;
 -}
 -
+ } // namespace Gtk
diff --cc gtk/src/buttonbox.hg
index f9a7f97,3bcee26..93419e5
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@@ -51,17 -58,28 +51,6 @@@ public
    _WRAP_METHOD(void set_child_secondary(Widget& child, bool is_secondary = true), gtk_button_box_set_child_secondary)
    _WRAP_METHOD(bool get_child_secondary(const Gtk::Widget& child) const, gtk_button_box_get_child_secondary)
  
-   _MEMBER_GET(child_min_width,child_min_width,int,int)
-   _MEMBER_SET(child_min_width,child_min_width,int,int)
- 
-   _MEMBER_GET(child_min_height,child_min_height,int,int)
-   _MEMBER_SET(child_min_height,child_min_height,int,int)
- 
-   _MEMBER_GET(child_ipadding_x,child_ipad_x,int,int)
-   _MEMBER_SET(child_ipadding_x,child_ipad_x,int,int)
- 
-   _MEMBER_GET(child_ipadding_y,child_ipad_y,int,int)
-   _MEMBER_SET(child_ipadding_y,child_ipad_y,int,int)
 -//TODO: Replace (and deprecate) with use of properties:
 -
 -
 -  int get_child_min_width() const;
 -
 -  //Note that the const int& is silly, but was once generated and must be kept for ABI.
 -  void set_child_min_width(const int& value);
 -
 -  int get_child_min_height() const;
 -
 -  //Note that the const int& is silly, but was once generated and must be kept for ABI.
 -  void set_child_min_height(const int& value);
 -
 -  int get_child_ipadding_x() const;
 -
 -  //Note that the const int& is silly, but was once generated and must be kept for ABI.
 -  void set_child_ipadding_x(const int& value);
 -
 -  int get_child_ipadding_y() const;
 -
 -  //Note that the const int& is silly, but was once generated and must be kept for ABI.
 -  void set_child_ipadding_y(const int& value);
  
    _WRAP_PROPERTY("layout-style", ButtonBoxStyle)
  };
diff --cc gtk/src/colorselection.ccg
index f553c5e,bd3f54a..61726bc
--- a/gtk/src/colorselection.ccg
+++ b/gtk/src/colorselection.ccg
@@@ -139,5 -139,9 +139,4 @@@ ColorSelection::set_change_palette_hook
    return old_slot;
  }
  
 -ColorSelection* ColorSelectionDialog::get_colorsel()
 -{
 -  return get_color_selection();
 -}
 -
  } // namespace Gtk
- 
diff --cc gtk/src/colorselection.hg
index d99e78d,9cb279e..9211d2b
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@@ -25,7 -25,12 +25,6 @@@ _PINCLUDE(gtkmm/private/dialog_p.h
  #include <gtkmm/dialog.h>
  #include <gtkmm/button.h>
  
- 
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to set the struct fields.
 -//TODO: Remove these functions anyway in an ABI break.
 -#undef GSEAL_ENABLE
 -#m4 _POP()
 -
  namespace Gtk
  {
  
@@@ -95,10 -100,32 +94,8 @@@ public
    _CTOR_DEFAULT()
    _WRAP_CTOR(ColorSelectionDialog(const Glib::ustring& title), gtk_color_selection_dialog_new)
  
-   _MEMBER_GET_PTR(colorsel,colorsel,ColorSelection*,GtkWidget*)
-   _MEMBER_GET_PTR(ok_button,ok_button,Button*,GtkWidget*)
-   _MEMBER_GET_PTR(cancel_button,cancel_button,Button*,GtkWidget*)
-   _MEMBER_GET_PTR(help_button,help_button,Button*,GtkWidget*)
+   _WRAP_METHOD(ColorSelection* get_color_selection(), gtk_color_selection_dialog_get_color_selection)
+   _WRAP_METHOD(const ColorSelection* get_color_selection() const, gtk_color_selection_dialog_get_color_selection)
 -
 -_DEPRECATE_IFDEF_START
 -  //TODO: Remove these in gtkmm 3. They use G_SEAL()ed struct fields.
 -
 -  /** @deprecated: Use get_color_selection() instead.
 -   */
 -  ColorSelection* get_colorsel();
 -
 -  /** @deprecated: Use get_color_selection() instead.
 -   */
 -  const ColorSelection* get_colorsel() const;
 -
 -  /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
 -   */
 -  _MEMBER_GET_PTR(ok_button,ok_button,Button*,GtkWidget*)
 -
 -  /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
 -   */
 -  _MEMBER_GET_PTR(cancel_button,cancel_button,Button*,GtkWidget*)
 -
 -  /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
 -   */
 -  _MEMBER_GET_PTR(help_button,help_button,Button*,GtkWidget*)
 -_DEPRECATE_IFDEF_END
  };
  
  } // namespace Gtk
diff --cc gtk/src/fontselection.hg
index 87ad302,146207f..d525c15
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@@ -21,6 -21,17 +21,7 @@@ _DEFS(gtkmm,gtk
  _PINCLUDE(gtkmm/private/box_p.h)
  _PINCLUDE(gtkmm/private/dialog_p.h)
  
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -// So we can still wrap the (deprecated) widget.
 -#undef GTK_DISABLE_DEPRECATED
 -#m4 _POP()
 -
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to set the struct fields.
 -//TODO: Remove these functions anyway in an ABI break.
 -#undef GSEAL_ENABLE
 -#m4 _POP()
+ 
  #include <gtkmm/dialog.h>
  #include <gtkmm/box.h>
  
@@@ -78,14 -89,32 +79,9 @@@ public
    _WRAP_METHOD(Glib::ustring get_preview_text() const, gtk_font_selection_get_preview_text)
    _WRAP_METHOD(void set_preview_text(const Glib::ustring& fontname),gtk_font_selection_set_preview_text)
  
-   // Font page
-   _MEMBER_GET_PTR(font_entry,font_entry,Entry*,GtkWidget*)
-   _MEMBER_GET_PTR(font_style_entry,font_style_entry,Entry*,GtkWidget*)
- 
-   _MEMBER_GET_PTR(pixels_button,pixels_button,RadioButton*,GtkWidget*)
-   _MEMBER_GET_PTR(points_button,points_button,RadioButton*,GtkWidget*)
-   _MEMBER_GET_PTR(filter_button,filter_button,Button*,GtkWidget*)
+   //TODO: Remove these accessors when we can break ABI.
+   //They probably all return null now anyway.
  
 -
 -_DEPRECATE_IFDEF_START
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_PTR(font_entry,font_entry,Entry*,GtkWidget*)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_PTR(font_style_entry,font_style_entry,Entry*,GtkWidget*)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_PTR(pixels_button,pixels_button,RadioButton*,GtkWidget*)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_PTR(points_button,points_button,RadioButton*,GtkWidget*)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_PTR(filter_button,filter_button,Button*,GtkWidget*)
 -_DEPRECATE_IFDEF_END
 -
    //Note: The GdkFont "font" property is deprecated, or should be.
    _WRAP_PROPERTY("font_name", Glib::ustring)
    _WRAP_PROPERTY("preview_text", Glib::ustring)
@@@ -115,10 -144,14 +111,13 @@@ public
    _WRAP_METHOD(Glib::ustring get_preview_text() const,gtk_font_selection_dialog_get_preview_text)
    _WRAP_METHOD(void set_preview_text(const Glib::ustring& fontname), gtk_font_selection_dialog_set_preview_text)
  
-   _MEMBER_GET_PTR(font_selection,fontsel,FontSelection*,GtkWidget*)
-   _MEMBER_GET_PTR(ok_button,ok_button,Button*,GtkWidget*)
-   _MEMBER_GET_PTR(apply_button,apply_button,Button*,GtkWidget*)
-   _MEMBER_GET_PTR(cancel_button,cancel_button,Button*,GtkWidget*)
+   _WRAP_METHOD(Button* get_ok_button(), gtk_font_selection_dialog_get_ok_button)
+   _WRAP_METHOD(const Button* get_ok_button() const, gtk_font_selection_dialog_get_ok_button, constversion)
+ 
+   _WRAP_METHOD(Button* get_cancel_button(), gtk_font_selection_dialog_get_cancel_button)
+   _WRAP_METHOD(const Button* get_cancel_button() const, gtk_font_selection_dialog_get_cancel_button, constversion)
+ 
 -  _WRAP_METHOD(Button* get_apply_button(), gtk_font_selection_dialog_get_apply_button)
 -  _WRAP_METHOD(const Button* get_apply_button() const, gtk_font_selection_dialog_get_apply_button, constversion)
++  _IGNORE(gtk_font_selection_dialog_get_apply_button) //deprecated
  };
  
  } // namespace Gtk
diff --cc gtk/src/handlebox.ccg
index 1c14491,d7b1f11..3a7bb30
--- a/gtk/src/handlebox.ccg
+++ b/gtk/src/handlebox.ccg
@@@ -26,20 -26,21 +26,4 @@@
  namespace Gtk
  {
  
- bool HandleBox::is_float_window_mapped() const
- {
-   return gobj()->float_window_mapped;
- }
- 
- bool HandleBox::is_in_drag() const
- {
-   return gobj()->in_drag;
- }
- 
- bool HandleBox::shrinks_on_detach() const
- {
-   return gobj()->shrink_on_detach;
- }
- 
 -_DEPRECATE_IFDEF_START
 -bool HandleBox::is_float_window_mapped() const
 -{
 -  return gobj()->float_window_mapped;
 -}
 -
 -bool HandleBox::is_in_drag() const
 -{
 -  return gobj()->in_drag;
 -}
 -
 -bool HandleBox::shrinks_on_detach() const
 -{
 -  return gobj()->shrink_on_detach;
 -}
 -_DEPRECATE_IFDEF_END
 -
  } /* namespace Gtk */
- 
diff --cc gtk/src/handlebox.hg
index bb7592a,6b313f5..fccbfef
--- a/gtk/src/handlebox.hg
+++ b/gtk/src/handlebox.hg
@@@ -53,18 -59,33 +53,11 @@@ public
    _WRAP_METHOD(void set_snap_edge(PositionType edge), gtk_handle_box_set_snap_edge)
    _WRAP_METHOD(PositionType get_snap_edge() const, gtk_handle_box_get_snap_edge)
  
-   _WRAP_SIGNAL(void child_attached(Widget* child), "child_attached")
-   _WRAP_SIGNAL(void child_detached(Widget* child), "child_detached")
- 
-   _MEMBER_GET_GOBJECT(bin_window, bin_window, Gdk::Window, GdkWindow*)
-   _MEMBER_GET_GOBJECT(float_window, float_window, Gdk::Window, GdkWindow*)
- 
    _WRAP_METHOD(bool is_child_detached() const, gtk_handle_box_get_child_detached)
  
-   bool is_float_window_mapped() const;
-   bool is_in_drag() const;
-   bool shrinks_on_detach() const;
+   _WRAP_SIGNAL(void child_attached(Widget* child), "child_attached")
+   _WRAP_SIGNAL(void child_detached(Widget* child), "child_detached")
  
 -_DEPRECATE_IFDEF_START
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_GOBJECT(bin_window, bin_window, Gdk::Window, GdkWindow*)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_GOBJECT(float_window, float_window, Gdk::Window, GdkWindow*)
 -
 -  /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
 -   */
 -  bool is_float_window_mapped() const;
 -
 -  /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
 -   */
 -  bool is_in_drag() const;
 -
 -  /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
 -   */
 -  bool shrinks_on_detach() const;
 -_DEPRECATE_IFDEF_END
 -
    //_WRAP_PROPERTY("shadow", ShadowType); //deprecated.
    _WRAP_PROPERTY("shadow-type", ShadowType)
    _WRAP_PROPERTY("handle-position", PositionType)
diff --cc gtk/src/menushell.hg
index c3d4e22,aafadd1..8146637
--- a/gtk/src/menushell.hg
+++ b/gtk/src/menushell.hg
@@@ -24,6 -24,12 +24,12 @@@ _PINCLUDE(gtkmm/menu.h
  _PINCLUDE(gtkmm/menubar.h)
  _PINCLUDE(gtkmm/window.h)
  
+ #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to use the ->children struct field.
 -//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
++//Allow us to set the struct fields.
++//TODO: We probably need to remove the STL-style children() API.
+ #undef GSEAL_ENABLE
+ #m4 _POP()
+ 
  #include <gtkmm/container.h>
  #include <gtkmm/menu_elems.h>
  #include <glibmm/helperlist.h>
diff --cc gtk/src/notebook.hg
index 42a1bd1,88f043e..b3e8c09
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@@ -27,6 -36,6 +27,12 @@@ _DEFS(gtkmm,gtk
  _PINCLUDE(gtkmm/private/container_p.h)
  #m4 _CONVERSION(guint,PositionType,`$2($3)')
  
++#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
++//Allow us to set the struct fields.
++//TODO: We probably need to remove the STL-style children() API.
++#undef GSEAL_ENABLE
++#m4 _POP()
++
  #ifndef DOXYGEN_SHOULD_SKIP_THIS
  extern "C"
  {
diff --cc gtk/src/offscreenwindow.hg
index 3ff3fe2,3ff3fe2..23a3fb6
--- a/gtk/src/offscreenwindow.hg
+++ b/gtk/src/offscreenwindow.hg
@@@ -16,9 -16,9 +16,6 @@@
   * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
--#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
--#undef GTK_DISABLE_DEPRECATED
--#m4 _POP()
  _CONFIGINCLUDE(gtkmmconfig.h)
  
  #include <gtkmm/window.h>
diff --cc gtk/src/ruler.hg
index 914860e,cbfcc8e..4960ffa
--- a/gtk/src/ruler.hg
+++ b/gtk/src/ruler.hg
@@@ -25,7 -24,12 +25,6 @@@
  _DEFS(gtkmm,gtk)
  _PINCLUDE(gtkmm/private/widget_p.h)
  
- 
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to use the struct fields.
 -//TODO: We need to remove these methods anyway in a future ABI break.
 -#undef GSEAL_ENABLE
 -#m4 _POP()
 -
  namespace Gtk
  {
  
@@@ -60,11 -61,22 +57,10 @@@ public
     * </ul>The default metric is Gtk::PIXELS.
     */
    _WRAP_METHOD(void set_metric(MetricType metric = PIXELS), gtk_ruler_set_metric)
-   _WRAP_METHOD(MetricType get_metric(), gtk_ruler_get_metric)
  
-   _MEMBER_GET(range_lower,lower,double,double)
-   _MEMBER_GET(range_upper,upper,double,double)
+   _WRAP_METHOD(MetricType get_metric() const, gtk_ruler_get_metric)
+   _WRAP_METHOD(MetricType get_metric(), gtk_ruler_get_metric, deprecated "Use the const version")
  
 -_DEPRECATE_IFDEF_START
 -//TODO: Remove these when we can break ABI:
 -
 -  /** @deprecated Use get_range() instead.
 -   */
 -  _MEMBER_GET(range_lower,lower,double,double)
 -
 -  /** @deprecated Use get_range() instead.
 -   */
 -  _MEMBER_GET(range_upper,upper,double,double)
 -_DEPRECATE_IFDEF_END
 -
    /** sets the range of the ruler.
     * <i>upper</i> and <i>lower</i> arguments denote the extents of the Ruler.
     * <i>max_size</i> is the largest number displayed by the ruler.
diff --cc gtk/src/scrolledwindow.hg
index 36eaa11,484e6b7..754d5ca
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@@ -23,7 -23,12 +23,6 @@@
  _DEFS(gtkmm,gtk)
  _PINCLUDE(gtkmm/private/bin_p.h)
  
- 
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to use the struct fields.
 -//TODO: W need to remove these methods anyway in a future ABI break.
 -#undef GSEAL_ENABLE
 -#m4 _POP()
 -
  namespace Gtk
  {
  
@@@ -91,9 -96,16 +90,6 @@@ public
    _WRAP_METHOD(HScrollbar* get_hscrollbar(), gtk_scrolled_window_get_hscrollbar)
    _WRAP_METHOD(const HScrollbar* get_hscrollbar() const, gtk_scrolled_window_get_hscrollbar)
  
-   _MEMBER_GET(vscrollbar_visible,vscrollbar_visible,bool,guint)
-   _MEMBER_GET(hscrollbar_visible,hscrollbar_visible,bool,guint)
- 
 -_DEPRECATE_IFDEF_START
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET(vscrollbar_visible,vscrollbar_visible,bool,guint)
 -
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET(hscrollbar_visible,hscrollbar_visible,bool,guint)
 -_DEPRECATE_IFDEF_END
 -
    //Keybinding signals:
    _IGNORE_SIGNAL("scroll_child")
    _IGNORE_SIGNAL("move_focus_out")
diff --cc gtk/src/table.hg
index 5779e40,bdf030f..fe9e83a
--- a/gtk/src/table.hg
+++ b/gtk/src/table.hg
@@@ -25,6 -25,12 +25,12 @@@
  _DEFS(gtkmm,gtk)
  _PINCLUDE(gtkmm/private/container_p.h)
  
+ #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to use the ->children struct field.
 -//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
++//Allow us to set the struct fields.
++//TODO: We probably need to remove the STL-style children() API.
+ #undef GSEAL_ENABLE
+ #m4 _POP()
+ 
  namespace Gtk
  {
  
diff --cc gtk/src/tearoffmenuitem.ccg
index 0b693e8,0b693e8..dc63205
--- a/gtk/src/tearoffmenuitem.ccg
+++ b/gtk/src/tearoffmenuitem.ccg
@@@ -25,9 -25,9 +25,4 @@@
  namespace Gtk
  {
  
--bool TearoffMenuItem::is_torn_off() const
--{
--  return gobj()->torn_off;
--}
--
  } /* namespace Gtk */
diff --cc gtk/src/tearoffmenuitem.hg
index c2d29f7,1c99ebb..6d263fb
--- a/gtk/src/tearoffmenuitem.hg
+++ b/gtk/src/tearoffmenuitem.hg
@@@ -39,8 -44,12 +39,6 @@@ class TearoffMenuItem : public MenuIte
    _CLASS_GTKOBJECT(TearoffMenuItem,GtkTearoffMenuItem,GTK_TEAROFF_MENU_ITEM,Gtk::MenuItem,GtkMenuItem)
  public:
    _CTOR_DEFAULT
--
-   bool is_torn_off() const;
 -_DEPRECATE_IFDEF_START
 -  /** @deprecated This method was apparently not useful and will be removed in a later gtkmm version, due to changes in GTK+.
 -   */
 -  bool is_torn_off() const;
 -_DEPRECATE_IFDEF_END
  };
  
  } /* namespace Gtk */
diff --cc gtk/src/widget.ccg
index 6cbfa00,133f037..e0174bb
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@@ -198,7 -198,7 +198,7 @@@ void Widget::unset_composite_name(
  
  void Widget::realize_if_needed()
  {
--  if(!is_realized())
++  if(!get_realized())
      realize();
  }
  
@@@ -278,15 -278,85 +278,6 @@@ void Widget::unset_cursor(
    gtk_widget_modify_cursor(gobj(), 0, 0);
  }
  
- bool Widget::has_no_window() const
-   { return GTK_WIDGET_NO_WINDOW(gobj()); }
- 
- bool Widget::is_realized() const
-   { return GTK_WIDGET_REALIZED(gobj()); }
- 
- bool Widget::is_mapped() const
-   { return GTK_WIDGET_MAPPED(gobj()); }
- 
 -_DEPRECATE_IFDEF_START
 -//deprecated:
 -bool Widget::has_no_window() const
 -  { return !get_has_window(); }
 -
 -//deprecated:
 -bool Widget::is_realized() const
 -  { return get_realized(); }
 -
 -//deprecated:
 -bool Widget::is_mapped() const
 -  { return get_mapped(); }
 -
 -//deprecated:
 -bool Widget::is_drawable() const
 -{
 -  return get_is_drawable();
 -}
 -
 -//deprecated:
 -bool Widget::receives_default() const
 -{
 -  return get_receives_default();
 -}
 -
 -//deprecated:
 -bool Widget::is_toplevel() const
 -{
 -  return get_is_toplevel();
 -}
 -
 -//deprecated:
 -bool Widget::is_visible() const
 -  { return get_visible(); }
 -
 -//deprecated:
 -bool Widget::sensitive() const
 -  { return get_sensitive(); }
 -
 -//deprecated:
 -bool Widget::app_paintable() const
 -  { return get_app_paintable(); }
 -
 -//deprecated:
 -bool Widget::double_buffered() const
 -  { return get_double_buffered(); }
 -
 -//deprecated:
 -bool Widget::rc_style() const
 -  { return has_rc_style(); }
 -
 -//deprecated:
 -bool Widget::is_composite_child() const
 -{
 -  return property_composite_child().get_value();
 -}
 -
 -//deprecated:
 -bool Widget::parent_sensitive() const
 -{
 -  const Gtk::Widget* parent = get_parent();
 -  if(!parent)
 -    return false;
 -
 -  return parent->get_sensitive();
 -}
 -
 -
 -WidgetFlags Widget::get_flags() const
 -  { return static_cast<WidgetFlags>(GTK_WIDGET_FLAGS(gobj())); }
 -
 -void Widget::set_flags(WidgetFlags flags)
 -  { GTK_WIDGET_SET_FLAGS(gobj(), static_cast<guint32>(flags)); }
 -
 -void Widget::unset_flags(WidgetFlags flags)
 -  { GTK_WIDGET_UNSET_FLAGS(gobj(), static_cast<guint32>(flags)); }
 -
 -_DEPRECATE_IFDEF_END
 -
  Allocation Widget::get_allocation() const
  {
    Allocation allocation;
@@@ -294,23 -364,14 +285,11 @@@
    return allocation;
  }
  
- bool Widget::parent_sensitive() const
-   { return GTK_WIDGET_PARENT_SENSITIVE(gobj()); }
--
- WidgetFlags Widget::get_flags() const
-   { return static_cast<WidgetFlags>(GTK_WIDGET_FLAGS(gobj())); }
--
- void Widget::set_flags(WidgetFlags flags)
-   { GTK_WIDGET_SET_FLAGS(gobj(), static_cast<guint32>(flags)); }
--
- void Widget::unset_flags(WidgetFlags flags)
-   { GTK_WIDGET_UNSET_FLAGS(gobj(), static_cast<guint32>(flags)); }
- 
  int Widget::get_width() const
-   { return gobj()->allocation.width; }
+   { return get_allocation().get_width(); }
  
  int Widget::get_height() const
-   { return gobj()->allocation.height; }
+   { return get_allocation().get_height(); }
  
  
  void Widget::drag_dest_set(DestDefaults flags, Gdk::DragAction actions)
diff --cc gtk/src/widget.hg
index f6424fe,0a0d4b8..004551f
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@@ -15,8 -15,19 +15,9 @@@
   * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -#undef GTK_DISABLE_DEPRECATED
 -#m4 _POP()
 -
 -#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 -//Allow us to set the struct fields.
 -//TODO: Remove these functions anyway in an ABI break.
 -#undef GSEAL_ENABLE
 -#m4 _POP()
 -
  _CONFIGINCLUDE(gtkmmconfig.h)
  
+ 
  #include <pangomm/context.h>
  #include <pangomm/layout.h>
  
@@@ -579,34 -595,97 +580,15 @@@ public
    _WRAP_METHOD(void set_has_tooltip(bool has_tooltip = TRUE), gtk_widget_set_has_tooltip)
    _WRAP_METHOD(bool get_has_tooltip() const, gtk_widget_get_has_tooltip)
  
-   /* FLAGS */
- 
-  //: Returns property {flags.nowindow}.
-   bool has_no_window() const;
- 
-   //: Returns property {flags.realized}.
-   bool is_realized() const;
- 
-   //: Returns property {flags.mapped}.
-   bool is_mapped() const;
- 
-   bool parent_sensitive() const;
- 
-   WidgetFlags get_flags() const;
-   void set_flags(WidgetFlags flags);
-   void unset_flags(WidgetFlags flags);
- 
 -_DEPRECATE_IFDEF_START
 -  /** @deprecated Use !get_has_window() instead.
 -   */
 -  bool has_no_window() const;
 -
 -  /** @deprecated Use get_realized() instead.
 -   */
 -  bool is_realized() const;
 -
 -  /** @deprecated Use get_mapped() instead.
 -   */
 -  bool is_mapped() const;
 -
 -  /** @deprecated: Use get_is_toplevel() instead.
 -   */
 -  bool is_toplevel() const;
 -
 -  /** @deprecated: Use get_is_drawable() instead.
 -   */
 -  bool is_drawable() const;
 -
 -  /** @deprecated: Use get_visible() instead.
 -   */
 -  bool is_visible() const;
 -
 -  /** @deprecated: Use get_sensitive() instead.
 -   */
 -  bool sensitive() const;
 -
 -  /** @deprecated: Use get_app_paintable() instead.
 -   */
 -  bool app_paintable() const;
 -
 -  /** @deprecated: Use get_receives_default() instead.
 -   */
 -  bool receives_default() const;
 -
 -  /** @deprecated: Use get_double_buffered() instead.
 -   */
 -  bool double_buffered() const;
 -
 -  /** @deprecated Call get_sensitive() on the result of get_parent() instead.
 -   */
 -  bool parent_sensitive() const;
 -
 -  _DEPRECATE_IFDEF_END
 -
 -  /** @deprecated: Use has_rc_style() instead.
 -   */
 -  bool rc_style() const;
 -
 -  _DEPRECATE_IFDEF_START
 -  /** Returns trye if the widget is a composite child of its parent.
 -   * @deprecated Use the "composite-child" property instead.
 -   */
 -  bool is_composite_child() const;
 -
 -  /**  @deprecated: Use the proper method to test individual states, suchas 
 -   * get_app_paintable(), get_can_default(),
 -   * get_can_focus(), get_double_buffered(),
 -   * has_default(), is_drawable(),
 -   * has_focus(), has_grab(), get_mapped(),
 -   * get_has_window(), has_rc_style(),
 -   * get_realized(), get_receives_default(),
 -   * get_sensitive(), is_sensitive(),
 -   * is_toplevel() or get_visible().
 -   */
 -  WidgetFlags get_flags() const;
 -
 -  //TODO: Document the deprecation when GTK+ does.
 -  void set_flags(WidgetFlags flags);
 -
 -  //TODO: Document the deprecation when GTK+ does.
 -  void unset_flags(WidgetFlags flags);
 -
 -  //TODO: Remove this when we can break ABI:
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
 -
 -  _DEPRECATE_IFDEF_END
 -
    int get_width() const;
    int get_height() const;
  
    _WRAP_METHOD(bool is_composited() const, gtk_widget_is_composited)
  
 -  //TODO: Deprecate this when the other widgets can derive from Gtk::Activatable.
 -  _WRAP_METHOD(Glib::RefPtr<Action> get_action(), gtk_widget_get_action, refreturn)
 -  _WRAP_METHOD(Glib::RefPtr<const Action> get_action() const, gtk_widget_get_action, refreturn, constversion)
 +  _IGNORE(gtk_widget_get_action) //deprecated
 +  _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_widget_get_related_action, refreturn)
 +  _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_widget_get_related_action, refreturn, constversion)
  
-   _MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
- 
    //TODO: Move this to protected when we can break API:
    /**  Retrieves the widget's requisition.
     *
diff --cc gtk/src/window.ccg
index 3262cfa,5a20318..bf432f3
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@@ -43,16 -43,20 +43,6 @@@ Glib::RefPtr<AccelGroup> Window::get_ac
    return accel_group_;
  }
  
- bool Window::is_toplevel() const
- {
-   return gobj()->type == GTK_WINDOW_TOPLEVEL;
- }
- 
- bool Window::is_popup() const
- {
-   return gobj()->type == GTK_WINDOW_POPUP;
- }
- 
 -_DEPRECATE_IFDEF_START
 -
 -bool Window::is_toplevel() const
 -{
 -  return Widget::get_is_toplevel();
 -}
 -
 -bool Window::is_popup() const
 -{
 -  return get_window_type() == WINDOW_POPUP;
 -}
 -
 -_DEPRECATE_IFDEF_END
 -
  void Window::raise()
  {
    get_window()->raise();
diff --cc gtk/src/window.hg
index 2f65772,237c9c2..8e80b61
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@@ -91,18 -97,25 +91,8 @@@ public
    _WRAP_PROPERTY("urgency_hint", bool)
    _WRAP_PROPERTY("accept-focus", bool)
    _WRAP_PROPERTY("focus-on-map", bool)
-   _WRAP_PROPERTY("deletable", bool) 
- 
-   bool is_toplevel() const;
-   bool is_dialog() const;
-   bool is_popup() const;
- 
-   _MEMBER_GET(window_type, type, WindowType, guint)
- 
-   //: This is special to the GTK+ linux-fb port.
-   _MEMBER_GET_GOBJECT(frame, frame, Gdk::Window, GdkWindow*)
- 
+   _WRAP_PROPERTY("deletable", bool)
  
 -_DEPRECATE_IFDEF_START
 -
 -  /** @deprecated Use Gtk::Widget::is_toplevel().
 -   */
 -  bool is_toplevel() const;
 -
 -  /** @deprecated: Use get_window_type().
 -   */
 -  bool is_popup() const;
 -
 -  // This is special to the GTK+ linux-fb port.
 -  /** @deprecated You should not need to call this method.
 -   */
 -  _MEMBER_GET_GOBJECT(frame, frame, Gdk::Window, GdkWindow*)
 -
 -_DEPRECATE_IFDEF_END
 -
    _WRAP_SIGNAL(void set_focus(Widget* focus), "set_focus")
    _WRAP_SIGNAL(bool frame_event(GdkEvent* event), "frame_event")
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]