GNOME.org
 

[gtkmm/gtkmm-3maybe: 18/19] Fixed merge

commit ba104af4ef98646a3f505941de4bf5595646a733
Merge: 2ff92e4 234f684
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 5 09:13:01 2010 +0100

    Fixed merge

 ChangeLog                                    |  280 ++++++++++++
 NEWS                                         |   34 ++-
 configure.ac                                 |    4 +-
 gdk/src/pixbufanimationiter.hg               |    3 +
 gdk/src/window.hg                            |   18 +-
 gtk/gtkmm.h                                  |    3 +
 gtk/gtkmm/border.h                           |   61 +++
 gtk/gtkmm/filelist.am                        |    1 +
 gtk/src/builder.ccg                          |   54 +++-
 gtk/src/builder.hg                           |   27 +-
 gtk/src/button.hg                            |   12 +-
 gtk/src/cellrendererspinner.ccg              |   20 +
 gtk/src/cellrendererspinner.hg               |   53 +++
 gtk/src/curve.hg                             |    9 +-
 gtk/src/dialog.hg                            |    2 +
 gtk/src/filelist.am                          |    7 +-
 gtk/src/fixed.hg                             |    9 +-
 gtk/src/gtk_enums.defs                       |   40 +--
 gtk/src/gtk_methods.defs                     |  598 +++++++++++++++++++++++++-
 gtk/src/gtk_signals.defs                     |  400 +++++++++++++++++
 gtk/src/inputdialog.hg                       |   10 +-
 gtk/src/menushell.ccg                        |    2 +
 gtk/src/menushell.hg                         |    2 -
 gtk/src/range.hg                             |    1 +
 gtk/src/spinner.ccg                          |   20 +
 gtk/src/spinner.hg                           |   48 ++
 gtk/src/toolitemgroup.ccg                    |   30 ++
 gtk/src/toolitemgroup.hg                     |   74 ++++
 gtk/src/toolpalette.ccg                      |   31 ++
 gtk/src/toolpalette.hg                       |  108 +++++
 gtk/src/treeview.hg                          |    2 +
 tools/extra_defs_gen/generate_defs_gtk.cc    |    2 +
 tools/m4/convert_gtk.m4                      |    2 +
 win32_installer/gtkmm-installer.nsi.in       |   38 +-
 win32_installer/translations/english.nsh     |    3 +
 win32_installer/translations/french.nsh      |    4 +
 win32_installer/translations/simpchinese.nsh |    4 +
 37 files changed, 1921 insertions(+), 95 deletions(-)
---
diff --cc ChangeLog
index 921dfa4,ac6ce68..8a8a61d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,147 -1,135 +1,427 @@@
++2010-01-04  Murray Cumming  <murrayc murrayc com>
++
++	Fix the build with new GTK+ deprecations, when using fatal warnings. 
++	
++	* gtk/src/button.hg: Use undef to fix the build with deprecated 
++	gtk_button_clicked() and friends. Deprecate the C++ methods.
++	* gtk/src/filelist.am:
++	* gtk/src/inputdialog.hg: Use undef to fix the build now that this is 
++	deprecated in GTK+. Deprecate it in gtkmm.
++
++2009-12-30  Murray Cumming  <murrayc murrayc com>
++
++	Gdk::Window::get_default_root_window(): Correct the reference counting.
++
++	* gdk/src/window.hg: get_default_root_window(): Use refreturn to 
++	correct ref the result.
++	Bug #603852 (Mikko Rasa).
++
++2009-12-22  Murray Cumming  <murrayc murrayc com>>
++
++	Added and used ToolItemGroup.
++
++	* gtk/src/toolitemgroup.[hg|ccg]: Added this GtkToolItemGroup wrapper.
++	* gtk/src/toolitem.hg: Use ToolItemGroup instead of Widget. 
++	See https://bugzilla.gnome.org/show_bug.cgi?id=567729#c37
++
++2009-12-21  Murray Cumming  <murrayc murrayc com>
++
++	ToolPalette: Added drag methods.
++
++	* tools/m4/convert_gtk.m4:
++	* gtk/src/toolpalette.hg: Added get_drag_item(), get_drag_target_item(), 
++	and get_drag_target_group().
++
++2009-12-17  Krzesimir Nowak  <qdlacz gmail com>
++
++	* gtk/gtkmm/border.h: Created separate header file for Gtk::Border.
++	It contains a typedef and Glib::Value specialization for Gtk::Border.
++	* gtk/gtkmm/filelist.am: Add border.h to gtkmm_files_extra_h.
++	* gtk/src/entry.hg: Remove Gtk::Border typedef and include border.h.
++	* gtk/src/range.hg: get_range_border() vfunc now uses Gtk::Border*
++	instead of GtkBorder*. Written proper conversions for this.
++	* gtk/gtkmm.h: Include the new border.h header.
++
++2009-12-17  Murray Cumming  <murrayc murrayc com>
++
++	Added ToolPalette.
++
++	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
++	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
++	* gtk/src/toolpalette.[hg|ccg]: An initial wrapper for GtkToolPalette.
++	* gtk/gtkmm.h: Include the new toolpalette.h header.
++
++2009-12-16  Armin Burgmeier  <armin arbur net>
++
++	* win32_installer/translations/english.nsh:
++	* win32_installer/translations/french.nsh:
++	* win32_installer/translations/simpchinese.nsh: Added a new string
++	recommending to choose a path not containing spaces for pkg-config to
++	work.
++
++	* win32_installer/gtkmm-installer.nsi.in: Show that string on the
++	installation directory page. Also remove libxml2 and libgail-util
++	documentation shortcuts from start menu on uninstall, and added
++	pangommconfig.h and fontconfig.pc to the installer.
++
 +2009-12-11  Krzesimir Nowak  <qdlacz gmail com>
 +
 +	* gtk/src/border.[hg|ccg]: Wrapped GtkBorder.
 +	* gtk/src/entry.hg: Removed a TODO and typedef and included border.h.
 +	* gtk/src/range.[hg|ccg]: Made get_range_border vfunc use Gtk::Border&
 +	instead of GtkBorder* - this needed wrapping it partially by hand by
 +	writing custom C callback.
 +	* tools/m4/convert_gtk.m4: Added conversion macros for Gtk::Border.
 +	* gtk/gtkmm.h: Added border.h include.
 +	* MSVC_Net{2005,2008}/gtkmm/gtkmm.vcproj: Added border.h and border.cc
 +	to build.
 +
++2009-12-10  Krzesimir Nowak  <qdlacz gmail com>
++
++	* gdk/src/window.hg: Remove extra colons at offscreen methods
++	to avoid warnings.
++
++2009-12-03  José Alburquerque  <jaalburqu svn gnome org>
++
++	Make build successful when exceptions, vfuncs, etc. are disabled.
++
++	* gtk/src/builder.hg:
++	* gtk/src/builder.ccg: Included definitions and code for Glib::Error
++	methods for when exceptions are disabled.
++	(get_type_from_name_vfunc_callback): Wrap around #ifdefs for when
++	vfuncs are not enabled.
++	* gtk/src/menushell.ccg:
++	* gtk/src/menushell.hg: Removed unneeded #endif and #ifdefs.
++	(MenuShell_Class::insert_vfunc_callback):  Wrap around #ifdefs for
++	when vfuncs are not enabled.
++
++2009-12-03  Murray Cumming  <murrayc murrayc com>
++
++	Gdk::Window: Add get/set_offscreen_embedder() and get_offscreen_pixmap().
++
++	* gdk/src/window.hg: Add get/set_offscreen_embedder() and 
++	get_offscreen_pixmap(), suggested by Oscar Lazzarino.
++
++2009-11-27  Benjamin Herr  <ben 0x539 de>
++
++	Gdk::PixbufAnimationIter: Make the methods public.
++
++	* gdk/src/pixbufanimationiter.hg: Made get_delay_time(), get_pixbuf(),
++	on_currently_loading_frame() and advance() public instead of
++	protected, as is necessary to actually use them.
++	Bug #598484.
++
++2009-11-27  Debarshi Ray  <debarshi ray gmail com>
++	
++	Added Dialog::get_widget_for_response().
++
++	* gtk/src/dialog.hg: Added get_widget_for_response(), wrapping 
++	gtk_dialog_get_widget_for_response().
++	* gtk/src/gtk_methods.defs: Added the C function definition.
++	Bug #600411.
++
++2009-11-27  Debarshi Ray  <debarshi ray gmail com>
++	
++	Add CellRendererSpin and Spinner.
++
++	* gtk/src/cellrenderspin.[hg|ccg]:
++	* gtk/src/spinner.[hg|ccg]: New files, wrapping new C API.
++	* gtk/src/gtk_methods.defs:
++	* gtk/src/gtk_signals.defs:
++	* tools/extra_defs_gen/generate_defs_gtk.cc: Add new definitions of the 
++	C API.
++	* gtk/gtkmm.h: Include the new headers.
++	* configure.ac: Require a newer version of GTK+.
++	Bug #598715.
++
++2009-10-30  Murray Cumming  <murrayc murrayc com>
++
++	VPaned documentation now says that it's vertical.
++
++	* gtk/src/paned.hg: Correct the VPaned documentation to say that it 
++	is vertical rather than horizontal. Fixes bug #598653 (merenyi).
++
++2009-10-27  Armin Burgmeier  <armin arbur net>
++
++	* win32_installer/gtkmm-installer.nsi.in: Add a bunch of new include
++	files in the GTK+ bundle to the installer, as well as gail.pc.
++
++2009-10-27  Armin Burgmeier  <armin arbur net>
++
++	* MSVC_Net2005/gtkmm/gtkmm.vcproj:
++	* MSVC_Net2008/gtkmm/gtkmm.vcproj: Added infobar.{h,cc} to the
++	project.
++
++	* win32_installer/build-installer: Don't copy /bundle/contrib since
++	this does not exist anymore in more recent GTK+ bundles.
++
++	* win32_installer/install-msvc-module:
++	* win32_installer/gtkmm-installer.nsi.in: Update for GTK+ 2.18 and
++	gtkmm 2.18.
++
 +2009-05-05  Murray Cumming  <murrayc murrayc com>
 +
 +	* gdk/gdkmm/general.[h|cc]:
 +	* gdk/src/event.hg:
 +	* gtk/gtkmm/comboboxentrytext.[h|cc]:
 +	* gtk/gtkmm/comboboxtext.[h|cc]:
 +	* gtk/src/icontheme.hg:
 +	* gtk/src/menuitem.hg:
 +	* gtk/src/treeview.hg: Removed more deprecated methods.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	* gtk/src/filechooser.hg: Use std::string for filenames, instead of ustring, 
 +	fixing bug #142138.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	* gdk/src/*.[hg|ccg]:
 +	* gtk/src/*.[hg|ccg]: Removed most deprecated methods.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	Removed deprecated classes.
 +	
 +	* gtk/src/combo.[hg|ccg]:
 +	* gtk/src/fileselection.[hg|ccg]:
 +	* gtk/src/optionmenu.[hg|ccg]:
 +	* gtk/src/progress.[hg|ccg]:
 +	* gtk/src/tooltips.[hg|ccg]: Removed these deprecated classes.
 +	* gtk/src/inputdialog.[hg|ccg]:
 +	* gtk/src/menutoolbutton.[hg|ccg]:	
 +	* gtk/src/eventbox.[hg|ccg]:
 +	* gtk/src/toolitem.[hg|ccg]:
 +	* gtk/src/toolbart.[hg|ccg]: Removed uses of these classes.
 +
 +2009-04-30  Murray Cumming  <murrayc murrayc com>
 +
 +	Inherit Buildable.
 +	
 +	* gtk/src/buildable.[hg|ccg]: Added this interface.
 +	* gtk/src/action.[hg|ccg]:
 +	* gtk/src/actiongroup.[hg|ccg]:
 +	* gtk/src/liststore.[hg|ccg]:
 +	* gtk/src/sizegroup.[hg|ccg]:
 +	* gtk/src/treestore.[hg|ccg]:
 +	* gtk/src/widget.[hg|ccg]: Inherit and Implement Buildable.
 +		
 +2009-04-30  Murray Cumming  <murrayc murrayc com>
 +
 +	Inherit Activatable, and some build fixes.
 +	
 +	* gtk/src/button.hg:
 +	* gtk/src/menuitem.hg:
 +	* gtk/src/recentchoosermenu.hg:
 +	* gtk/src/toolbutton.hg:
 +	* gtk/src/toolitem.hg: Inherit and Implement Activatable.
 +	
 +	* gtk/src/iconview.hg:
 +	* gtk/src/treeviewcolumn.hg:
 +	* gtk/src/entrycompletion.hg: Correct the _IMPLEMENTS_INTERFACE() spelling to 
 +		fix the build.
 +	* gtk/src/separator.hg: Include orientable.h to fix the build.
 +
 +2009-04-28  Murray Cumming  <murrayc murrayc com>
 +
 +	Fixed build, plus some const changes.
 +
 +	* gdk/src/*.hg: Fixed build errors caused by previous changes.
 +	Some const changes that were not possible without breaking ABI.
 +	Not sure exactly what because I cannot get git to give me a diff.
 +
 +2009-04-27  Johannes Schmid <jschmid openismus com>
 +
 +	* gtk/src/statusicon.ccg:
 +	Reference the returned statusicon because the RefPtr becomes invalid
 +	otherwise (#575268)
 +
 +2009-04-24  Murray Cumming  <murrayc murrayc com>
 +
 +	Derive classes from CellLayout, CellEditable, and Orientable.
 + 
 +	* gtk/src/accelgroup.hg:
 +	* gtk/src/actiongroup.hg: 
 +	* gtk/src/clipboard.hg:
 +	* gtk/src/cellrenderercombo.hg: Put back the no_default_handler option 
 +	because the C structs have no default handlers.
 +	
 +	* gtk/src/box.hg:
 +	* gtk/src/buttonbox.hg:
 +	* gtk/src/paned.hg:
 +	* gtk/src/ruler.hg:
 +	* gtk/src/scalebutton.hg:
 +	* gtk/src/scrollbar.hg:
 +	* gtk/src/separator.hg:
 +	* gtk/src/spinbutton.hg: Derive from Orientable.
 +	
 +	* gtk/src/combobox.hg: Derived from CellEditable.
 +		
 +	* gtk/src/entrycompletion.hg: 
 +	* gtk/src/iconview.hg: 
 +	* gtk/src/treeviewcolumn.hg: Derive from CellLayout.
 +
 +2009-04-24  Murray Cumming  <murrayc murrayc com>
 +
 +	Remove uses of no_default_handler.	
 +	
 +	* gdk/src/pixbufloader.hg:
 +	* gtk/src/accelgroup.hg:
 +	* gtk/src/actiongroup.hg:
 +	* gtk/src/cellrenderer.hg:
 +	* gtk/src/cellrenderercombo.hg:
 +	* gtk/src/clipboard.hg:
 +	* gtk/src/entry.hg:
 +	* gtk/src/entrycompletion.hg:
 +	* gtk/src/filechooser.hg:
 +	* gtk/src/filechooserbutton.hg:
 +	* gtk/src/menushell.hg:
 +	* gtk/src/notebook.hg:
 +	* gtk/src/range.hg:
 +	* gtk/src/recentchooser.hg:
 +	* gtk/src/spinbutton.hg:
 +	* gtk/src/statusicon.hg:
 +	* gtk/src/textbuffer.hg:
 +	* gtk/src/toolitem.hg:
 +	* gtk/src/uimanager.hg:
 +	* gtk/src/widget.hg: Remove use of the no_default_handler option with 
 +	_WRAP_SIGNAL(), breaking ABI by adding virtual methods.
 +
 +This is the gtkmm-3maybe branch, for API/ABI breaking changes, for a possible 
 +future gtkmm-3.0.
 +
 +=======
++=======
+ 2.19.2:
+ 
+ 2010-01-04  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix the build with new GTK+ deprecations, when using fatal warnings. 
+ 	
+ 	* gtk/src/button.hg: Use undef to fix the build with deprecated 
+ 	gtk_button_clicked() and friends. Deprecate the C++ methods.
+ 	* gtk/src/fixed.hg:  Use undef to fix the build with deprecated 
+ 	gtk_fixed_set_has_window() and gtk_fixed_get_has_window().
+ 	Deprecate the C++ methods.
+ 	* gtk/src/filelist.am:
+ 	* gtk/src/curve.hg:
+ 	* gtk/src/inputdialog.hg: Use undef to fix the build now that these are 
+ 	deprecated in GTK+. Deprecate it in gtkmm.
+ 
+ 2009-12-30  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Gdk::Window::get_default_root_window(): Correct the reference counting.
+ 
+ 	* gdk/src/window.hg: get_default_root_window(): Use refreturn to 
+ 	correct ref the result.
+ 	Bug #603852 (Mikko Rasa).
+ 
+ 2009-12-22  Murray Cumming  <murrayc murrayc com>>
+ 
+ 	Added and used ToolItemGroup.
+ 
+ 	* gtk/src/toolitemgroup.[hg|ccg]: Added this GtkToolItemGroup wrapper.
+ 	* gtk/src/toolitem.hg: Use ToolItemGroup instead of Widget. 
+ 	See https://bugzilla.gnome.org/show_bug.cgi?id=567729#c37
+ 
+ 2009-12-21  Murray Cumming  <murrayc murrayc com>
+ 
+ 	ToolPalette: Added drag methods.
+ 
+ 	* tools/m4/convert_gtk.m4:
+ 	* gtk/src/toolpalette.hg: Added get_drag_item(), get_drag_target_item(), 
+ 	and get_drag_target_group().
+ 
+ 2009-12-17  Krzesimir Nowak  <qdlacz gmail com>
+ 
+ 	* gtk/gtkmm/border.h: Created separate header file for Gtk::Border.
+ 	It contains a typedef and Glib::Value specialization for Gtk::Border.
+ 	* gtk/gtkmm/filelist.am: Add border.h to gtkmm_files_extra_h.
+ 	* gtk/src/entry.hg: Remove Gtk::Border typedef and include border.h.
+ 	* gtk/src/range.hg: get_range_border() vfunc now uses Gtk::Border*
+ 	instead of GtkBorder*. Written proper conversions for this.
+ 	* gtk/gtkmm.h: Include the new border.h header.
+ 
+ 2009-12-17  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Added ToolPalette.
+ 
+ 	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+ 	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+ 	* gtk/src/toolpalette.[hg|ccg]: An initial wrapper for GtkToolPalette.
+ 	* gtk/gtkmm.h: Include the new toolpalette.h header.
+ 
+ 2009-12-16  Armin Burgmeier  <armin arbur net>
+ 
+ 	* win32_installer/translations/english.nsh:
+ 	* win32_installer/translations/french.nsh:
+ 	* win32_installer/translations/simpchinese.nsh: Added a new string
+ 	recommending to choose a path not containing spaces for pkg-config to
+ 	work.
+ 
+ 	* win32_installer/gtkmm-installer.nsi.in: Show that string on the
+ 	installation directory page. Also remove libxml2 and libgail-util
+ 	documentation shortcuts from start menu on uninstall, and added
+ 	pangommconfig.h and fontconfig.pc to the installer.
+ 
+ 2009-12-10  Krzesimir Nowak  <qdlacz gmail com>
+ 
+ 	* gdk/src/window.hg: Remove extra colons at offscreen methods
+ 	to avoid warnings.
+ 
+ 2009-12-03  José Alburquerque  <jaalburqu svn gnome org>
+ 
+ 	Make build successful when exceptions, vfuncs, etc. are disabled.
+ 
+ 	* gtk/src/builder.hg:
+ 	* gtk/src/builder.ccg: Included definitions and code for Glib::Error
+ 	methods for when exceptions are disabled.
+ 	(get_type_from_name_vfunc_callback): Wrap around #ifdefs for when
+ 	vfuncs are not enabled.
+ 	* gtk/src/menushell.ccg:
+ 	* gtk/src/menushell.hg: Removed unneeded #endif and #ifdefs.
+ 	(MenuShell_Class::insert_vfunc_callback):  Wrap around #ifdefs for
+ 	when vfuncs are not enabled.
+ 
+ 2009-12-03  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Gdk::Window: Add get/set_offscreen_embedder() and get_offscreen_pixmap().
+ 
+ 	* gdk/src/window.hg: Add get/set_offscreen_embedder() and 
+ 	get_offscreen_pixmap(), suggested by Oscar Lazzarino.
+ 
+ 2009-11-27  Benjamin Herr  <ben 0x539 de>
+ 
+ 	Gdk::PixbufAnimationIter: Make the methods public.
+ 
+ 	* gdk/src/pixbufanimationiter.hg: Made get_delay_time(), get_pixbuf(),
+ 	on_currently_loading_frame() and advance() public instead of
+ 	protected, as is necessary to actually use them.
+ 	Bug #598484.
+ 
+ 2009-11-27  Debarshi Ray  <debarshi ray gmail com>
+ 	
+ 	Added Dialog::get_widget_for_response().
+ 
+ 	* gtk/src/dialog.hg: Added get_widget_for_response(), wrapping 
+ 	gtk_dialog_get_widget_for_response().
+ 	* gtk/src/gtk_methods.defs: Added the C function definition.
+ 	Bug #600411.
+ 
+ 2009-11-27  Debarshi Ray  <debarshi ray gmail com>
+ 	
+ 	Add CellRendererSpin and Spinner.
+ 
+ 	* gtk/src/cellrenderspin.[hg|ccg]:
+ 	* gtk/src/spinner.[hg|ccg]: New files, wrapping new C API.
+ 	* gtk/src/gtk_methods.defs:
+ 	* gtk/src/gtk_signals.defs:
+ 	* tools/extra_defs_gen/generate_defs_gtk.cc: Add new definitions of the 
+ 	C API.
+ 	* gtk/gtkmm.h: Include the new headers.
+ 	* configure.ac: Require a newer version of GTK+.
+ 	Bug #598715.
+ 
 -This is the master branch. See also the gtkmm-2-18 branch.
 -
  2009-10-30  Murray Cumming  <murrayc murrayc com>
  
  	VPaned documentation now says that it's vertical.
diff --cc gtk/src/button.hg
index 6211d09,30f73d4..8b484c8
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@@ -19,8 -19,13 +19,14 @@@
   * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
+ #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+ // So we can still wrap the (deprecated) gtk_button_pressed(), gtk_button_clicked(), 
+ // and gtk_button_enter functions.
+ #undef GTK_DISABLE_DEPRECATED
+ #m4 _POP()
+ 
  #include <gtkmm/bin.h>
 +#include <gtkmm/activatable.h>
  #include <gtkmm/stockid.h>
  _DEFS(gtkmm,gtk)
  _PINCLUDE(gtkmm/private/bin_p.h)
diff --cc gtk/src/filelist.am
index f083581,078bcc3..3d7f0fb
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@@ -48,10 -47,9 +49,8 @@@ gtkmm_files_any_hg =		
  	clipboard.hg		\
  	colorbutton.hg		\
  	colorselection.hg	\
--	combobox.hg		\
  	comboboxentry.hg	\
  	container.hg		\
- 	curve.hg		\
  	dialog.hg		\
  	drawingarea.hg		\
  	editable.hg		\
@@@ -154,8 -154,11 +153,10 @@@
  	toolbar.hg		\
  	toolbutton.hg		\
  	toolitem.hg		\
+ 	toolitemgroup.hg	\
+ 	toolpalette.hg		\
  	toolshell.hg		\
  	tooltip.hg		\
 -	tooltips.hg		\
  	treedragdest.hg		\
  	treedragsource.hg	\
  	treeiter.hg		\
diff --cc gtk/src/inputdialog.hg
index 06603d0,f86a10e..695fe8d
--- a/gtk/src/inputdialog.hg
+++ b/gtk/src/inputdialog.hg
@@@ -33,10 -38,14 +38,10 @@@ namespace Gt
  class Button;
  class Table;
  
 -_DEPRECATE_IFDEF_START
 -class OptionMenu;
 -_DEPRECATE_IFDEF_END
 -
  class ScrolledWindow;
  
- // Don't list this in the documentation's Dialogs group because it isn't really useful
- // - see the GTK+ docs.
+ /** @deprecated As of gtkmm 2.20, this widget has been deprecated since it is too specialized. 
+  */
  class InputDialog : public Dialog
  {
    _CLASS_GTKOBJECT(InputDialog,GtkInputDialog,GTK_INPUT_DIALOG,Gtk::Dialog,GtkDialog)
diff --cc gtk/src/range.hg
index 588901a,59ec04a..af42af9
--- a/gtk/src/range.hg
+++ b/gtk/src/range.hg
@@@ -107,23 -109,9 +107,24 @@@ public
    _WRAP_PROPERTY("fill-level", double)
    
  protected:
 -#m4 _CONVERSION(`Gtk::Border*',`GtkBorder*',($3))
 -#m4 _CONVERSION(`GtkBorder*',`Gtk::Border*',($3))
 -  _WRAP_VFUNC(void get_range_border(Gtk::Border* border) const, get_range_border)
 +  virtual void get_range_border_vfunc(Gtk::Border& border) const;
++
 +#m4begin
 +dnl /* get_range_border_vfunc is wrapped partially by hand (C callback is
 +dnl  * custom), because this vfunc is a getter with a "return value" as
 +dnl  * parameter. This complicates things a bit - we cannot use Glib::wrap in
 +dnl  * obj->get_range_border_vfunc(Glib::wrap(c_border));
 +dnl  * because compiler complains about passing `Gtk::Border', when expecting
 +dnl  * `Gtk::Border&'. Using `Gtk::Border(c_border)' also does not work, because
 +dnl  * it is making a copy of passed C border and, when went out of scope,
 +dnl  * destroys it without copying contents to a C border. See:
 +dnl  * https://bugzilla.gnome.org/show_bug.cgi?id=603926#c3
 +dnl  */
 +dnl // _VFUNC_H is not used - prototype is written above.
 +  _VFUNC_PH(get_range_border, void, `GtkRange* self, GtkBorder* border')
 +  _VFUNC_CC(get_range_border_vfunc, get_range_border, void, void, `Gtk::Border& border', `border.gobj()', 1)
 +dnl // _VFUNC_PCC is not used - custom C callback is implemented in range.ccg.
 +#m4end
  };
  
  } // namespace Gtk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]