[gtkmm/gtkmm-3maybe: 8/8] Fix merge conflicts.

[Murray Cumming <murrayc src gnome org>]

commit 4f7176558ffa85c3b8053f2e2ee5540ccae6f42c
Merge: 8468b51 4fedf48
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 28 10:47:53 2010 +0100

    Fix merge conflicts.

 ChangeLog                                 |   31 +++
 NEWS                                      |   32 +++
 configure.ac                              |    4 +-
 gtk/src/action.hg                         |    1 +
 gtk/src/activatable.hg                    |    3 +-
 gtk/src/entry.hg                          |   14 +-
 gtk/src/entrybuffer.ccg                   |   48 ++++
 gtk/src/entrybuffer.hg                    |  119 +++++++++
 gtk/src/filelist.am                       |    1 +
 gtk/src/gtk_docs.xml                      |  408 +++++++++++++++++++++--------
 gtk/src/gtk_methods.defs                  |   73 +++++
 gtk/src/range.ccg                         |    8 +
 gtk/src/range.hg                          |   20 ++
 gtk/src/statusicon.hg                     |    1 +
 gtk/src/widget.hg                         |    2 +-
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 +
 tools/m4/convert_gtk.m4                   |    4 +
 17 files changed, 659 insertions(+), 111 deletions(-)
---
diff --cc ChangeLog
index 8e49720,33ffc8a..7b1fbf9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,58 +1,34 @@@
 -2010-01-28  Murray Cumming  <murrayc murrayc com>
 -
 -	Action: Undeprecate some methods.
 -
 -	* gtk/src/action.hg: Do not deprecate connect_proxy(), 
 -	disconnect_proxy(), block_activate_from() and unblock_activate_from(), 
 -	because we cannot derive existing classes from Activatable (their 
 -	replacement) until we can break ABI.
 -	Fixes bug #608109 (David Trowbridge)
 -
+ 2010-01-27  Murray Cumming  <murrayc murrayc com>
+ 
+ 	EntryBuffer: Actually use GtkEntryBuffer.
+ 
+ 	* gtk/src/entrybuffer.hg: Use GtkEntryBuffer, not GtkTextBuffer, 
+ 	avoiding a wanting about registering the same type twice.
+ 	Remove useless TextBuffer-relatated includes.
+ 
 -2010-01-27  Murray Cumming  <murrayc murrayc com>
 -
 -	Widget: Un-deprecate get_action().
 -
 -	* gtk/src/widget.hg: get_action(): Do not deprecate this because we 
 -	cannot yet use its replacement (adding Activatable as a base class).
 -	Do not try to wrap a gtk_widget_get_related_action() function which 
 -	no longer exists, if it ever did.
 -	* gtk/src/activatable.hg: Add a TODO to use this, though we 
 -	already have TODOs on the widgets that should use it when we can break 
 -	ABI.
 -
 -2.19.4:
 -
+ 2010-01-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Range, StatusIcon: Added new methods.
+ 
+ 	* gtk/src/gtk_methods.defs: Regnerated with h2defs.py
+ 	* gtk/src/range.[hg|ccg]: Added get/set_slider_size_fixed(), 
+ 	get/set_min_slider_size(), get_slider_range(), get_range_rect().
+ 	* gtk/src/statusicon.hg: Added set_name()
+ 
+ 2010-01-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Added EntryBuffer and used it in the Entry API.
+ 
+ 	* gtk/src/entrybuffer.[hg|cc]: Added EntryBuffer. GtkEntryBuffer was 
+ 	actually added to GTK+ 2.18, but we didn't wrap it until now.
+ 	* gtk/src/entry.hg: Aded get/set_buffer(), propery, and new constructor.
+ 
+ 2010-01-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Entry: Added get_text_window() and get_icon_window().
+ 
+ 	* gtk/src/entry.hg: Added get_text_window() and get_icon_window().
+ 
  2010-01-19  Murray Cumming  <murrayc murrayc com>
  
  	Updated gtk_docs.xml to get API reference for new methods.
diff --cc gtk/src/action.hg
index c7311cc,c8ebb7b..e326110
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@@ -158,7 -158,10 +158,8 @@@ public
    _WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item)
    _WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item)
    _WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu)
+ 
 -  //TODO: Deprecate these when we can derive the appropriate widgets from Activatable, when we can break ABI.
 -  _WRAP_METHOD(void connect_proxy(Widget& proxy), gtk_action_connect_proxy)
 -  _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy)
 +  _IGNORE(gtk_action_connect_proxy, gtk_action_disconnect_proxy) // deprecated
  
  #m4 dnl // This isn't in convert_gtk.m4, and the default behaviour is wrong.
  #m4 _CONVERSION(`GSList*', `Glib::SListHandle<Widget*>', `$2($3, Glib::OWNERSHIP_NONE)')
diff --cc gtk/src/range.ccg
index 3801fbe,6c9598c..68d18fc
--- a/gtk/src/range.ccg
+++ b/gtk/src/range.ccg
@@@ -29,52 -29,13 +29,60 @@@ void Range::unset_adjustment(
    gtk_range_set_adjustment(gobj(), 0);
  }
  
 +#ifdef GLIBMM_VFUNCS_ENABLED
 +void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* border)
 +{
 +  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
 +      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
 +
 +  // Non-gtkmmproc-generated custom classes implicitly call the default
 +  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
 +  // generated classes can use this optimisation, which avoids the unnecessary
 +  // parameter conversions if there is no possibility of the virtual function
 +  // being overridden:
 +  if(obj_base && obj_base->is_derived_())
 +  {
 +    CppObjectType *const 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
 +    }
 +  }
 +
 +  BaseClassType *const base = static_cast<BaseClassType*>(
 +      g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
 +  );
 +
 +  // Call the original underlying C function:
 +  if(base && base->get_range_border)
 +    (*base->get_range_border)(self, border);
 +
 +}
 +#endif //GLIBMM_VFUNCS_ENABLED
 +
+ Gdk::Rectangle Range::get_range_rect() const
+ {
+   Gdk::Rectangle result;
+   gtk_range_get_range_rect(const_cast<GtkRange*>(gobj()), result.gobj());
+   return result;
+ }
+ 
++
  } // namespace Gtk
  
  
diff --cc gtk/src/widget.hg
index cb74f91,37d93b3..0ef8f16
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@@ -599,11 -649,10 +599,11 @@@ public
  
    _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)
    _MEMBER_GET(requisition, requisition, Requisition, GtkRequisition)