[gtkmm/gtkmm-3maybe: 99/99] Fixed merge conflicts from master
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3maybe: 99/99] Fixed merge conflicts from master
- Date: Mon, 23 Nov 2009 08:20:27 +0000 (UTC)
commit 2786159541222956fe295e660e4c9f6c14bcba44
Merge: c9e0fc0... 1a97973...
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Nov 23 09:20:07 2009 +0100
Fixed merge conflicts from master
.gitignore | 71 +-
CHANGES | 88 -
ChangeLog | 839 ++-
MAINTAINERS | 9 -
MSVC_Net2005/Makefile.am | 3 -
MSVC_Net2005/atkmm/Makefile.am | 3 -
MSVC_Net2005/atkmm/atkmm.rc.in | 14 +-
MSVC_Net2005/demos/Makefile.am | 1 -
MSVC_Net2005/demos/gtk-demo/Makefile.am | 1 -
MSVC_Net2005/filelist.am | 17 +
MSVC_Net2005/gdkmm/Makefile.am | 13 -
MSVC_Net2005/gdkmm/gdkmm.rc.in | 14 +-
MSVC_Net2005/gendef/Makefile.am | 2 -
MSVC_Net2005/gtkmm/Makefile.am | 13 -
MSVC_Net2005/gtkmm/gtkmm.rc.in | 8 +-
MSVC_Net2005/gtkmm/gtkmm.vcproj | 8 +
MSVC_Net2008/Makefile.am | 3 -
MSVC_Net2008/atkmm/Makefile.am | 3 -
MSVC_Net2008/atkmm/atkmm.rc.in | 14 +-
MSVC_Net2008/demos/Makefile.am | 1 -
MSVC_Net2008/demos/gtk-demo/Makefile.am | 1 -
MSVC_Net2008/filelist.am | 17 +
MSVC_Net2008/gdkmm/Makefile.am | 13 -
MSVC_Net2008/gdkmm/gdkmm.rc.in | 14 +-
MSVC_Net2008/gendef/Makefile.am | 2 -
MSVC_Net2008/gtkmm/Makefile.am | 13 -
MSVC_Net2008/gtkmm/gtkmm.rc.in | 8 +-
MSVC_Net2008/gtkmm/gtkmm.vcproj | 8 +
Makefile.am | 136 +-
NEWS | 119 +
atk/Makefile.am | 14 -
atk/atkmm-1.6.pc.in | 11 -
atk/atkmm-uninstalled.pc.in | 10 +
atk/atkmm.pc.in | 19 +
atk/atkmm/Makefile.am | 70 +-
atk/atkmm/filelist.am | 9 +
atk/atkmm/private/.gitignore | 1 +
atk/atkmm/private/Makefile.am | 14 -
atk/src/Makefile.am | 35 +-
atk/src/Makefile_list_of_hg.am_fragment | 12 -
atk/src/filelist.am | 33 +
atk/src/hyperlink.hg | 29 +-
autogen.sh | 117 +-
build/.gitignore | 12 +
{scripts => build}/reduced.m4 | 0
build_shared/Makefile_build.am_fragment | 50 -
build_shared/Makefile_build_gensrc.am_fragment | 86 -
build_shared/Makefile_gensrc.am_fragment | 67 -
config.h.in | 7 -
configure.ac | 573 +-
demos/Makefile.am | 102 +-
demos/apple-red.png | Bin 3545 -> 0 bytes
demos/background.jpg | Bin 22219 -> 0 bytes
demos/gnome-applets.png | Bin 3090 -> 0 bytes
demos/gnome-calendar.png | Bin 2755 -> 0 bytes
demos/gnome-foot.png | Bin 2916 -> 0 bytes
demos/gnome-gimp.png | Bin 3410 -> 0 bytes
demos/gnome-gmush.png | Bin 3244 -> 0 bytes
demos/gnome-gsame.png | Bin 4263 -> 0 bytes
demos/gnu-keys.png | Bin 3852 -> 0 bytes
demos/gtk-demo/Makefile.am | 72 -
demos/pixbuf-demo.cc | 57 +-
docs/Makefile.am | 76 +-
docs/Makefile_web.am_fragment | 17 -
docs/images/Makefile.am | 16 -
docs/reference/Doxyfile.in | 281 +-
docs/reference/Makefile.am | 116 -
docs/reference/gtkmm_footer.html_fragment | 8 -
docs/reference/gtkmm_header.html_fragment | 21 -
docs/reference/images/Makefile.am | 5 -
docs/reference/images/widgets/Makefile.am | 10 -
gdk/Makefile.am | 13 -
gdk/README | 1 -
gdk/gdkmm-2.4.pc.in | 11 -
gdk/gdkmm-uninstalled.pc.in | 10 +
gdk/gdkmm.pc.in | 19 +
gdk/gdkmm/Makefile.am | 55 +-
gdk/gdkmm/filelist.am | 9 +
gdk/gdkmm/general.h | 35 +-
gdk/gdkmm/private/.gitignore | 1 +
gdk/gdkmm/private/Makefile.am | 14 -
gdk/gdkmmconfig.h.in | 15 +-
gdk/src/Makefile.am | 34 +-
gdk/src/Makefile_list_of_hg.am_fragment | 13 -
gdk/src/color.hg | 2 +-
gdk/src/display.hg | 24 +-
gdk/src/displaymanager.hg | 2 +-
gdk/src/dragcontext.hg | 8 -
gdk/src/drawable.hg | 2 +-
gdk/src/event.hg | 9 +-
gdk/src/filelist.am | 41 +
gdk/src/gdk_docs.xml | 2817 +++--
gdk/src/gdk_enums.defs | 36 +-
gdk/src/gdk_methods.defs | 1137 ++-
gdk/src/pixbuf.ccg | 40 +
gdk/src/pixbuf.hg | 86 +-
gdk/src/pixbufanimationiter.hg | 2 +-
gdk/src/window.ccg | 5 +
gdk/src/window.hg | 82 +-
gtk/Makefile.am | 13 -
gtk/README | 6 -
gtk/gtkmm-2.4.pc.in | 11 -
gtk/gtkmm-uninstalled.pc.in | 10 +
gtk/gtkmm.h | 1 +
gtk/gtkmm.pc.in | 19 +
gtk/gtkmm/Makefile.am | 84 +-
gtk/gtkmm/accelmap.h | 8 +-
gtk/gtkmm/filelist.am | 41 +
gtk/gtkmm/listviewtext.h | 2 +-
gtk/gtkmm/private/.gitignore | 1 +
gtk/gtkmm/private/Makefile.am | 14 -
gtk/gtkmm/stock.h | 34 +-
gtk/gtkmm/stockid.h | 43 +-
gtk/gtkmm/treemodelcolumn.h | 16 +-
gtk/gtkmmconfig.h.in | 73 +-
gtk/src/Makefile.am | 36 +-
gtk/src/Makefile_list_of_hg.am_fragment | 43 -
gtk/src/aboutdialog.hg | 29 +-
gtk/src/action.hg | 40 +-
gtk/src/activatable.hg | 2 +-
gtk/src/assistant.hg | 2 +-
gtk/src/box.ccg | 4 +-
gtk/src/builder.ccg | 39 +
gtk/src/builder.hg | 48 +-
gtk/src/calendar.hg | 34 +-
gtk/src/cellrenderer.hg | 34 +-
gtk/src/cellrendereraccel.hg | 2 +-
gtk/src/cellrendererprogress.hg | 2 +-
gtk/src/cellrendererspin.hg | 2 +-
gtk/src/cellrenderertoggle.hg | 3 +
gtk/src/cellview.hg | 31 +-
gtk/src/clipboard.ccg | 109 +-
gtk/src/clipboard.hg | 6 +-
gtk/src/colorbutton.hg | 6 +-
gtk/src/combobox.hg | 2 +-
gtk/src/comboboxentry.hg | 2 +-
gtk/src/container.ccg | 14 +-
gtk/src/dialog.hg | 6 +-
gtk/src/entrycompletion.hg | 6 +-
gtk/src/enums.hg | 5 +-
gtk/src/expander.hg | 4 +-
gtk/src/filechooser.hg | 4 +
gtk/src/filechooserwidget.hg | 2 +-
gtk/src/filelist.am | 197 +
gtk/src/gtk_docs.xml |16429 +++++++++++++-----------
gtk/src/gtk_docs_override.xml | 16 +
gtk/src/gtk_enums.defs | 148 +-
gtk/src/gtk_methods.defs | 795 ++-
gtk/src/gtk_signals.defs | 2223 +++-
gtk/src/iconset.hg | 9 +
gtk/src/icontheme.hg | 2 +-
gtk/src/iconview.hg | 36 +-
gtk/src/image.hg | 4 +-
gtk/src/infobar.ccg | 29 +
gtk/src/infobar.hg | 93 +
gtk/src/label.hg | 10 +
gtk/src/linkbutton.hg | 6 +-
gtk/src/menu.hg | 6 +-
gtk/src/menuitem.hg | 24 +-
gtk/src/menutoolbutton.hg | 22 +-
gtk/src/messagedialog.hg | 4 +-
gtk/src/notebook.hg | 42 +-
gtk/src/orientable.hg | 2 +-
gtk/src/pagesetup.hg | 14 +-
gtk/src/pagesetupunixdialog.hg | 2 +-
gtk/src/paned.hg | 2 +-
gtk/src/papersize.hg | 6 +-
gtk/src/printcontext.hg | 2 +-
gtk/src/printer.hg | 2 +-
gtk/src/printjob.hg | 2 +-
gtk/src/printoperation.hg | 20 +-
gtk/src/printoperationpreview.hg | 2 +-
gtk/src/printsettings.hg | 12 +-
gtk/src/printunixdialog.hg | 15 +-
gtk/src/radiotoolbutton.hg | 8 +-
gtk/src/range.hg | 2 +
gtk/src/rc.hg | 2 +-
gtk/src/recentaction.hg | 2 +-
gtk/src/recentchooser.hg | 2 +-
gtk/src/recentchooserdialog.hg | 2 +-
gtk/src/recentchoosermenu.hg | 2 +-
gtk/src/recentchooserwidget.hg | 2 +-
gtk/src/recentfilter.hg | 2 +-
gtk/src/recentinfo.ccg | 34 +-
gtk/src/recentinfo.hg | 79 +-
gtk/src/recentmanager.ccg | 4 +-
gtk/src/recentmanager.hg | 17 +-
gtk/src/scalebutton.hg | 30 +-
gtk/src/selectiondata.hg | 2 +-
gtk/src/statusicon.hg | 69 +-
gtk/src/style.hg | 10 +-
gtk/src/textbuffer.hg | 4 +-
gtk/src/textmark.hg | 8 +-
gtk/src/toolbar.hg | 35 +-
gtk/src/toolbutton.hg | 15 +-
gtk/src/toolitem.hg | 21 +-
gtk/src/toolshell.hg | 2 +-
gtk/src/tooltip.hg | 3 +-
gtk/src/treeiter.hg | 5 +-
gtk/src/treemodel.hg | 2 +-
gtk/src/treepath.ccg | 2 +-
gtk/src/treepath.hg | 7 +-
gtk/src/treeview.hg | 127 +-
gtk/src/treeviewcolumn.hg | 21 +-
gtk/src/uimanager.hg | 6 +-
gtk/src/volumebutton.hg | 2 +-
gtk/src/widget.ccg | 97 +-
gtk/src/widget.hg | 265 +-
gtk/src/window.hg | 3 +-
gtkmm.doap | 6 +-
scripts/Makefile.am | 4 -
scripts/README | 2 -
scripts/cxx.m4 | 140 -
scripts/cxx_std.m4 | 153 -
scripts/dk-warn.m4 | 114 -
scripts/docgen.m4 | 18 -
scripts/macros.m4 | 51 -
tests/Makefile.am | 77 +-
tests/Makefile.am_fragment | 20 -
tests/boxhelper/main.cc | 29 +
tests/child_widget/Makefile.am | 6 -
tests/child_widget2/Makefile.am | 6 -
tests/child_widget_managed/Makefile.am | 6 -
tests/delete_cpp_child/Makefile.am | 6 -
tests/dialog/Makefile.am | 6 -
tests/dialog_deletethis/Makefile.am | 6 -
tests/main_with_options/Makefile.am | 6 -
tests/menu_destruction/Makefile.am | 6 -
tests/property_notification/Makefile.am | 6 -
tests/refcount_dialog/Makefile.am | 6 -
tests/scrolledwindow/Makefile.am | 6 -
tests/wrap_existing/Makefile.am | 6 -
tools/Makefile.am | 34 +-
tools/Makefile_list_of_sources.am_fragment | 2 -
tools/README | 4 -
tools/TODO | 12 -
tools/extra_defs_gen/Makefile.am | 8 -
tools/extra_defs_gen/generate_defs_gtk.cc | 76 +-
tools/m4/Makefile.am | 10 -
tools/m4/Makefile_list_of_sources.am_fragment | 3 -
tools/m4/convert_gdk.m4 | 1 +
tools/m4/convert_gtk.m4 | 6 +
tools/m4/filelist.am | 9 +
win32_installer/Makefile.am | 16 -
win32_installer/NSISLibrary/Makefile.am | 11 -
win32_installer/build-installer | 2 +-
win32_installer/filelist.am | 28 +
win32_installer/gtkmm-installer.nsi.in | 202 +-
win32_installer/install-msvc-module | 90 +-
win32_installer/translations/Makefile.am | 1 -
250 files changed, 18514 insertions(+), 12579 deletions(-)
---
diff --cc ChangeLog
index 4828747,255f1d1..0d0d011
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,134 -1,839 +1,971 @@@
+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.
+
++=======
+ 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-10-18 Daniel Elstner <daniel kitta gmail com>
+
+ Correct Gtk::TreeModelColumnRecord documentation
+
+ * gtk/gtkmm/treemodelcolumn.h (Gtk::TreeModelColumnRecord): Remove
+ bogus sentence vaguely cautioning against the use of static variables
+ to implement singletons. Reword the preceding sentence to avoid this
+ sort of misunderstanding.
+
+ 2009-10-13 David King <davidk openismus com>
+
+ * gtk/src/dialog.hg: Change return type of
+ Gtk::Dialog::get_action_area() to Gtk::ButtonBox* from Gtk::HButtonBox*
+ to fix breakage on Maemo Fremantle. Fixes bug #597779.
+ * tools/m4/convert_gtk.m4: New conversion from GtkWidget* to
+ Gtk::ButtonBox*.
+
+ 2009-10-04 Daniel Elstner <daniel kitta gmail com>
+
+ Increment version to 2.18.2 and update news
+
+ * configure.ac (AC_INIT): Increment version to 2.18.2.
+ (LIBGTKMM_SO_VERSION): Reset revision and increment current and
+ age to indicate that API has been added to the library.
+ ({ATK,GDK,GTK}MM_MODULES): Tighten module version requirements
+ to the recent stable releases of every module.
+ (MM_PREREQ): Require mm-common 0.8.
+ * NEWS: Write news entry for the gtkmm 2.18.2 release.
+
+ 2009-10-04 Daniel Elstner <daniel kitta gmail com>
+
+ Resurrect Widget::can_default() and can_focus()
+
+ * gtk/src/widget.{ccg,hg} (Gtk::Widget::can_default): Wrap using
+ _WRAP_METHOD(), thereby reintroducing the accidentally removed
+ method implementation.
+ (can_focus): Use _WRAP_METHOD() to bring back both the declaration
+ and the implementation of this accidentally removed method.
+ (get_allocation): Properly implement the accessor in terms of
+ gtk_widget_get_allocation().
+
+ 2009-09-22 José Alburquerque <jaalburqu svn gnome org>
+
+ gtkmm.h: Add infobar.h to list of includes.
+
+ * gtk/gtkmm.h: Add infobar.h.
+
+ 2.18.1:
+
+ 2009-09-21 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/recentmanager.hg: Do not deprecate get_default().
+ This was a mistake in Daniel's commit on 2009-09-18.
+
+ 2.18.0:
+
+ 2009-09-21 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/gtk_docs.xml: Regenerated.
+
+ 2009-09-21 Murray Cumming <murrayc murrayc-desktop>
+
+ Regenerate enums .defs.
+
+ * gdk/src/gdk_enums.defs:
+ * gtk/src/gtk_enums.defs: Regenerated.
+ This adds a Gdk::CURSOR_BLANK, as requested in bug #591029 (Hammered).
+
+ 2009-09-21 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/style.hg: get_style_property(): Use const_cast to maybe
+ avoid a (correct) compiler error with the Intel C++ compiler.
+ Bug #594171 (Alexander Shaduri).
+
+ * gdk/src/gdk_methods.defs: Comment out an unused broken definition.
+
+ 2009-09-19 Daniel Elstner <daniel kitta gmail com>
+
+ Support Automake silent rules
+
+ * configure.ac: Call the AM_SILENT_RULES macro if it is defined.
+ (MM_INIT_MODULE): Move block below Automake initialization.
+ * autogen.sh: Pass --verbose option to autoreconf.
+
+ 2009-09-18 Daniel Elstner <danielk openismus com>
+
+ Fix build with deprecated C API disabled
+
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Undefine the macros
+ {ATK,GDK,GTK}_DISABLE_DEPRECATED before including the GTK+ headers,
+ so that all extra defs can be generated even in fatal warnings mode.
+ * {atk,gdk,gtk}/src/*.hg: For all source files which contain calls
+ to deprecated functions of the C API, inject an #undef preprocessor
+ statement before any header includes to make the deprecated API
+ visible when building gtkmm itself. Mark C++ methods as deprecated
+ where appropriate, but generally only when a replacement is already
+ available. Also correct a lot of whitespace errors along the way.
+
+ 2009-09-18 Daniel Elstner <danielk openismus com>
+
+ Insert missing Autoconf macro argument separator
+
+ * configure.ac (GTKMM_WXXFLAGS): Insert the missing argument
+ separator between the third and fourth macro arguments. This
+ means the deprecation macros are now defined correctly again
+ when building in fatal warnings mode.
+
+ 2009-09-17 Daniel Elstner <danielk openismus com>
+
+ Update Doxygen configuration for Doxygen 1.6.1
+
+ * docs/reference/Doxyfile.in: Update configuration for Doxygen 1.6.1.
+ (SORT_MEMBERS_CTORS_1ST): Set to YES.
+
+ 2009-09-17 Murray Cumming <murrayc murrayc com>
+
+ Require a recent pangomm.
+
+ * configure.ac: Require a recent pangomm version, because gtkmmconfig.h
+ now requires the new pangommconfig.h. This was a (correct) side-effect
+ of using the new mm-common build system, I think. Bug #593049
+ (Frederic Peters).
+
+ 2009-09-15 Daniel Elstner <danielk openismus com>
+
+ Correct misuse of container handle (bgo #586626)
+
+ * gtk/src/clipboard.{ccg,hg} (Clipboard::wait_for_targets): Create
+ an intermediate array of allocated C strings and transfer ownership
+ on return, instead of trying to returned a handle to a container
+ with local scope. (Based on patch by Peter Clifton.)
+ (SignalProxy_TargetsReceived_gtk_callback): Correct another misuse
+ of the container handles similar to the above, except for the crash.
+ (SignalProxy_RichTextReceived_gtk_callback): Simplify the code and
+ plug a memory leak in the event of an exception.
+
+ 2009-09-07 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/window.hg: Added set_icon_name().
+
+ 2009-09-07 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/enums.hg: Include gtkmmconfig.h because we use
+ GTKMM_MAEMO_EXTENSIONS_ENABLED.
+
+ 2.17.11:
+
+ 2009-09-06 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/infobar.hg: Added class documentation.
+
+ 2009-09-06 Murray Cumming <murrayc murrayc com>
+
+ Gdk::Window: Wrapped new methods.
+
+ * gdk/src/gdk_methods.defs: Regenerated.
+ * gdk/src/window.[hg|cc]: Added redirect_to_drawable(),
+ remove_redirection(), geometry_changed(), get_root_coords(), restack().
+
+ 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.
+ * gtk/src/range.hg: Added get/set_flippable.
+ * gtk/src/widget.[hg]: Added get_is_toplevel(), get_is_drawable(),
+ get/set_receives_default(), wrapping the new C functions,
+ deprecating the hand-coded non get-prefixed versions.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Increment version to 2.17.9.3 and update news
+
+ * configure.ac (AC_INIT): Bump version number to 2.17.9.3.
+ * NEWS: Write news entry for gtkmm 2.17.9.3.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Fix documentation location in pkg-config files
+
+ * {atk,gdk,gtk}/{atk,gdk,gtk}mm{,-uninstalled}.pc.in (htmlrefpub):
+ Point to library.gnome.org.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Increment version to 2.17.9.2 and update news
+
+ * configure.ac (AC_INIT): Bump version number to 2.17.9.2.
+ * NEWS: Write news entry for gtkmm 2.17.9.2.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Remove documentation location override
+
+ * docs/Makefile.am (htmlrefpub): Remove variable override as
+ the documentation is now hosted on library.gnome.org. D'oh.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Increment version to 2.17.9.1 and update news
+
+ * configure.ac (AC_INIT): Bump version number to 2.17.9.1.
+ (AM_INIT_AUTOMAKE): Enable check-news option.
+ (MM_PREREQ): Require mm-common 0.7.1.
+ * NEWS: Write news entry for gtkmm 2.17.9.1.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Use shared mm-common Doxygen style sheet
+
+ * configure.ac (MM_PREREQ): Require mm-common 0.7.
+ * docs/reference/Doxyfile.in (HTML_STYLESHEET): Assign path
+ to the shared doxygen.css provided by mm-common.
+
+ 2009-08-28 Daniel Elstner <danielk openismus com>
+
+ Remove header and footer HTML fragments
+
+ * docs/reference/gtkmm_{header,footer}.html_fragment: Delete
+ files. These custom fragments were an unnecessary maintenance
+ hassle. Also, the files were out of date with respect to the
+ encoding and CSS classes used by Doxygen.
+ * docs/reference/Doxyfile.in (HTML_HEADER), (HTML_FOOTER): Set
+ to the empty string.
+ (PROJECT_NUMBER): Substitute @PACKAGE_VERSION It does look
+ nicer in the generated HTML pages, and is probably also less
+ confusing.
+ (SORT_GROUP_NAMES): Enable for predictability.
+ * docs/Makefile.am (dist_noinst_DATA): Remove deleted HTML
+ fragment files.
+
+ 2009-08-26 Daniel Elstner <danielk openismus com>
+
+ Reenable hierarchy graphs for each class
+
+ * docs/reference/Doxyfile.in (COLLABORATION_GRAPH): Set option
+ to YES to enable the per-class inheritance graphs.
+
+ 2.17.9:
+
+ 2009-08-25 Daniel Elstner <danielk openismus com>
+
+ RecentInfo: Correct get_application_info() so it can actually be used.
+
+ * gtk/src/recentinfo.[hg|ccg]: get_application_info(): Correct the
+ app_exec parameter to a Glib::ustring& instead of a
+ Glib::StringArrayHandle& app_exec. This method could not have been
+ used before without crashing so this is not a real ABI break.
+ equal(): Reimplement with _WRAP_METHOD() instead of hand-coding.
+ get_applications(), get_length(): Make the implementations more robust
+ by using the length parameter.
+
+ Bug #590381
+
+ 2009-08-25 Murray Cumming <murrayc murrayc com>
+
+ Regenerated C documentation XML and wrapped some new API.
+
+ * gdk/src/gdk_docs.xml:
+ * gtk/src/gtk_docs.xml: Regenerated.
+ * gtk/src/printoperation.hg: Added update_custom_widget signal.
+ * gtk/src/statusicon.hg: Added get/set_title() and property.
+
+ 2009-08-24 Murray Cumming <murrayc murrayc-desktop>
+
+ Fix an API break.
+
+ * gtk/src/widget.[hg|cc]: Add back is_visible(), deprecated, calling
+ get_visible().
+
+ 2009-08-24 Murray Cumming <murrayc murrayc com>
+
+ Widget, CellRenderer, PrintUnixDialog: Wrapped some new functions.
+
+ * gtk/src/cellrenderer.hg: Added get/set_alignment(),
+ get/set_padding(), get/set_visible(),
+ get/set_sensitive().
+ * gtk/src/cellrenderertoggle.hg: Added set/get_activatable().
+ * gtk/src/filechooser.hg: Added get/set_create_folders() and property.
+ * gtk/src/label.hg: Added get/set_track_visited_links() and property.
+ * gtk/src/menu.hg: Added get/set_reserve_toggle_size() and property.
+ * gtk/src/printunixdialog.hg: Added set/get_support_selection(),
+ set/get_support_selection(), set/get_has_selection(),
+ set/get_embed_page_setup(), s/get_embed_page_setup(), and
+ get_page_setup_set().
+ * gtk/src/widget.[hg|ccg]:
+ is_sensitive(), can_focus(), has_focus(), has_grab(), has_default(),
+ is_visible(): Reimplement with new gtk_widget_*() functions.
+ sensitive(), double_buffered(), app_paintable(), can_default():
+ Deprecated in favour of new get_*() methods.
+ Added get/set_has_window().
+
+ 2009-08-24 Murray Cumming <murrayc murrayc com>
+
+ Regenerated the main .defs files.
+
+ * gtk/src/gtk_enums.defs:
+ * gtk/src/gtk_methods.defs:
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkInfoBar.
+ * gtk/src/gtk_signals.defs: Regenerated
+ * gtk/src/infobar.hg: response signal: Added the parameter.
+ * gtk/src/printoperation.hg: Added get/set_embed_page_setup() and
+ get_n_pages_to_print() and properties.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Rename @since back to @newin
+
+ * docs/reference/Doxyfile.in (ALIASES): Rename the @since alias
+ back to its old name @newin, but otherwise keep the parameters.
+ Apparently there is a @since command predefined in Doxygen which
+ I hadn't noticed. It does seem to get overridden silently, but
+ it is better not to rely on this.
+ * g[dt]k/src/*.hg, g[dt]k/g[dt]kmm/*.h: Replace all uses of @since
+ with @newin.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Do not hard-code API version in resource files
+
+ * MSVC_Net200[58]/atkmm/atkmm.rc.in: Use newer @PACKAGE_VERSION@
+ substitution in place of @VERSION Substitute @ATKMM_MODULE_NAME@
+ instead of hardcoding the API version. Replace @GTKMM_*_VERSION@
+ substitutions with their @ATKMM_*_VERSION@ equivalents.
+ * MSVC_Net200[58]/gdkmm/gdkmm.rc.in: Use newer @PACKAGE_VERSION@
+ substitution in place of @VERSION Substitute @GDKMM_MODULE_NAME@
+ instead of hardcoding the API version. Replace @GTKMM_*_VERSION@
+ substitutions with their @GDKMM_*_VERSION@ equivalents.
+ * MSVC_Net200[58]/gtkmm/gtkmm.rc.in: Use newer @PACKAGE_VERSION@
+ substitution in place of @VERSION Substitute @GTKMM_MODULE_NAME@
+ instead of hardcoding the API version.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Substitute API version in filenames dynamically
+
+ * atk/atkmm.pc.in: Rename file from atk/atkmm-1.6.pc.in.
+ * atk/atkmm-uninstalled.pc.in: Rename file from
+ atk/atkmm-1.6-uninstalled.pc.in.
+ * gdk/gdkmm.pc.in: Rename file from gdk/gdkmm-2.4.pc.in.
+ * gdk/gdkmm-uninstalled.pc.in: Rename file from
+ gdk/gdkmm-2.4-uninstalled.pc.in.
+ * gtk/gtkmm.pc.in: Rename file from gtk/gtkmm-2.4.pc.in.
+ * gtk/gtkmm-uninstalled.pc.in: Rename file from
+ gtk/gtkmm-2.4-uninstalled.pc.in.
+ * configure.ac (AC_CONFIG_FILES): Insert ${ATKMM_MODULE_NAME},
+ ${GDKMM_MODULE_NAME} and ${GTKMM_MODULE_NAME} into output filenames
+ and remove the hard-coded version from the input filenames.
+ * {atk,gdk,gtk}/{atk,gdk,gtk}mm/Makefile.am (lib_LTLIBRARIES):
+ Substitute @{ATK,GDK,GTK}MM_API_VERSION@ into the libtool archive
+ names as well as the variable names derived from them instead of
+ hard-coding the API versions.
+
+ 2009-08-19 Daniel Elstner <danielk openismus com>
+
+ Predefine ATKMM_API and GDKMM_API for Doxygen
+
+ * docs/reference/Doxyfile.in (PREDEFINED): Define the ATKMM_API and
+ GDKMM_API macros to the empty expansion, so they won't show up in
+ the generated documentation.
+
+ 2009-08-18 Daniel Elstner <danielk openismus com>
+
+ Use parametric Doxygen alias @since{m,n}
+
+ * docs/reference/Doxyfile.in (ALIASES): Define a parametrized alias
+ @since{major,minor} to replace the old @newin?p?* aliases which had
+ to be defined manually for every version number used.
+ * g[dt]k/src/*.hg, g[dt]k/g[dt]kmm/*.h: Change all occurrences of
+ @newin?p?* to @since{m,n}.
+
+ 2009-08-17 Daniel Elstner <danielk openismus com>
+
+ Define {ATK,GDK,GTK}MM_BUILD macros
+
+ * atk/atkmm/Makefile.am (local_cppflags): Append -DATKMM_BUILD=1.
+ * gdk/gdkmm/Makefile.am (local_cppflags): Append -DGDKMM_BUILD=1.
+ * gtk/gtkmm/Makefile.am (local_cppflags): Append -DGTKMM_BUILD=1.
+
+ 2009-08-17 Daniel Elstner <danielk openismus com>
+
+ Make use of new MM_DISABLE_DEPRECATED_API macro
+
+ * configure.ac ({ATK,GDK,GTK}MM_DISABLE_DEPRECATED): Call the
+ new MM_ARG_DISABLE_DEPRECATED_API macro from mm-common in
+ order to provide the option to omit deprecated API from the
+ library build, and to define the corresponding configuration
+ macros.
+
+ 2009-08-17 Daniel Elstner <daniel kitta gmail com>
+
+ Append slash to overridden $(htmlrefpub)
+
+ * docs/Makefile.am (htmlrefpub): Append trailing slash for
+ consistency with the non-overridden value.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Define *_DISABLE_DEPRECATED in config header
+
+ * configure.ac ({ATK,GDK,GTK}MM_DISABLE_DEPRECATED): Go back to
+ AC_DEFINE() instead of setting DISABLE_DEPRECATED_API_CFLAGS to
+ a list of -D options to pass to the compiler.
+ * gdk/gdkmmconfig.h.in (GDKMM_DISABLE_DEPRECATED): Copy #undef
+ statement from the config.h.in generated by autoheader.
+ * gtk/gtkmmconfig.h.in (GTKMM_DISABLE_DEPRECATED): ditto.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Add missing gdkmm dependency to pkg-config file
+
+ * gtk/gtkmm-2.4.pc.in (Requires): List @GDKMM_MODULE_NAME@ as
+ a dependency, since it is not among @GTKMM_MODULES@ already.
+ * gtk/gtkmm-2.4-uninstalled.in (Requires): Use @GTKMM_MODULES@
+ again instead of @GDKMM_MODULES
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Update and clean up g[dt]kmmconfig.h
+
+ * gdk/gdkmmconfig.h.in (GDKMM_*_VERSION): Add #undef statements
+ for the version number component macros.
+ * gtk/gtkmmconfig.h.in: Clean up and copy #undef statements from
+ the config.h.in file generated by autoheader.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Provide pkg-config files for uninstalled use
+
+ * atk/atkmm-1.6-uninstalled.pc.in: New pkg-config metadata file
+ for building against a non-installed library.
+ * gdk/gdkmm-2.4-uninstalled.pc.in: ditto,
+ * gtk/gtkmm-2.4-uninstalled.pc.in: ditto.
+ * configure.ac (GTKMM_REQ_ATKMM): Rename from GTKMM_PC_ATKMM_DEP.
+ (GTKMM_REQ_ATKMM_UNINST): Add variant for the uninstalled library.
+ (AC_CONFIG_FILES): List new *-uninstalled.pc output files.
+ * gtk/gtkmm-2.4.pc.in (Requires): Substitute @GTKMM_REQ_ATKMM
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Simplify and update for recent mm-common
+
+ * configure.ac: Insert MM_PREREQ([0.4]) macro call.
+ (MM_INIT_MODULE): Omit now optional second argument.
+ * atk/atkmm-1.6.pc.in, {gdk,gtk}/{gdk,gtk}mm-2.4.pc.in (htmlrefpub):
+ Append trailing slash to URL, as per new mm-common recommendation.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Get rid of obsolete GLIBMM_USING_STD()
+
+ * gtk/gtkmm/treemodelcolumn.h: Stop using GLIBMM_USING_STD(), now
+ that it has been removed from glibmm.
+ * gtk/src/{textbuffer,treeiter,treepath}.hg: ditto.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Rename scripts/ to build/ for consistency
+
+ * build/: Rename directory from scripts/ for consistency with the
+ other binding modules that switched to the new build system.
+ * configure.ac (AC_CONFIG_AUX_DIR): Change to build/ directory.
+ (AC_CONFIG_MACRO_DIR): ditto.
+ * Makefile.am (ACLOCAL_AMFLAGS): Include M4 files from build/.
+ * {atk,gdk,gtk}/*/Makefile.am: Include mm-common build files from
+ $(top_srcdir)/build/.
+ * docs/Makefile.am: ditto.
+
+ 2009-08-13 Daniel Elstner <daniel kitta gmail com>
+
+ Reference new canonical name of cairomm tag file
+
+ * configure.ac (cairomm-1.0.tag): Change from cairomm_doxygen_tags
+ to the new canonical name of the cairomm tag file.
+
+ 2009-08-13 Daniel Elstner <daniel kitta gmail com>
+
+ Distribute gtk/gtkmm/wrap_init.h
+
+ * gtk/gtkmm/filelist.am (gtkmm_files_extra_h): List wrap_init.h.
+
+ 2009-08-13 Daniel Elstner <daniel kitta gmail com>
+
+ Clean up remaining cruft in scripts/
+
+ * Makefile.am (DIST_SUBDIRS): Remove the explicit assignment, and
+ have Automake figure it out for itself.
+ * configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile output
+ file. Merge the remaining output files into one list, and clean
+ up a bit.
+ * scripts/Makefile.am: Delete now unused build file.
+ * scripts/README: Delete unhelpful text file.
+ * scripts/{cxx,cxx_std,dk-warn,docgen,macros}.m4: Delete outdated
+ and no longer used Autoconf macro files.
+
+ 2009-08-12 Daniel Elstner <daniel kitta gmail com>
+
+ Convert tests/ to non-recursive build
+
+ * configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile ouputs.
+ * tests/Makefile.am: Overhaul, modernize and make non-recursive.
+ Build the test program targets on make check instead of make all.
+ * tests/*/Makefile.am: Delete now unused build files.
+ * tests/Makefile.am_fragment: ditto.
+ * docs/Makefile_web.am_fragment: Delete left-over file.
+
+ 2009-08-12 Daniel Elstner <daniel kitta gmail com>
+
+ Remove duplicate image files for pixbuf-demo
+
+ * demos/pixbuf-demo.cc: Clean up a few minor things.
+ (background_name), (image_names): Prefix "gtk-demo/" to the file
+ names so that it can pick up the files from the subdirectory.
+ * demos/Makefile.am (dist_democode_DATA): Split into two variables
+ $(democode_DATA) and $(dist_democode_DATA) to avoid copying source
+ code files twice into the distribution.
+ * demos/background.jpg, demos/*.png: Delete duplicate image files.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Bring back demos/ and make it non-recursive
+
+ * configure.ac (AC_CONFIG_FILES): Add output file demos/Makefile.
+ * Makefile.am (SUBDIRS): Recurse into demos/ subdirectory again.
+ * demos/Makefile.am: Overhaul, modernize and make non-recursive.
+ Build the demo program targets on make check instead of make all.
+ Install all gtkmm-demo source files, as there is little point in
+ not shipping the full compilable set. Stop installing gtkmm-demo
+ for now. Do we really need this installed?
+ * demos/gtk-demo/Makefile.am: Delete now unused file.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Fix GLIBMM vs GTKMM typo
+
+ * gtk/gtkmm/Makefile.am (AM_CXXFLAGS): It's $(GTKMM_WXXFLAGS).
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Un-invert DISABLE_DEPRECATED_API conditional
+
+ * configure.ac (DISABLE_DEPRECATED_API): Invert the accidentally
+ reversed test condition for AM_CONDITIONAL().
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Remove header dependency of gdkmm on gtkmm
+
+ * gdk/src/dragcontext.hg: Remove #include <gtkmm/stockid.h>, which
+ appears to have been left over from an earlier change to avoid the
+ dependency. The problem got caught due to the shortened include
+ paths of the new build setup. Also get rid of a pointless forward
+ declaration of Gtk::Widget.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Correct tag reference to pangomm
+
+ * configure.ac (MM_ARG_WITH_TAGFILE_DOC): The module name of the
+ current pangomm API is pangomm-1.4, not pangomm-2.4. Ooops.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Convert documentation to new build system
+
+ * configure.ac (MM_ARG_ENABLE_DOCUMENTATION): Call macro.
+ (MM_ARG_WITH_TAGFILE_DOC): Call once for each tagfile dependency.
+ (AC_CONFIG_FILES): Remove output files docs/images/Makefile and
+ docs/reference/**/Makefile from the list.
+ * Makefile.am (SUBDIRS): Include docs/ conditionally.
+ * docs/Makefile.am: Rewrite based upon the new doc-reference.am
+ build support file from the mm-common module.
+ * docs/reference/Doxyfile.in: Replace with modernized Doxygen
+ configuration and adapt to the new mm-common build organization.
+ * docs/images/Makefile.am: Delete old recursive build file.
+ * docs/reference/Makefile.am: ditto,
+ * docs/reference/reference/Makefile.am: ditto,
+ * docs/reference/images/Makefile.am: ditto,
+ * docs/reference/images/widgets/Makefile.am: ditto.
+ * atk/atkmm-1.6.pc.in, gdk/gdkmm-2.4.pc.in, gtk/gtkmm-2.4.pc.in:
+ Overhaul and make use of more configuration substitutions. Provide
+ the locations of the reference documentation and the tag file.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Convert main source directories to mm-common
+
+ * configure.ac: Get rid of some more cruft we no longer need.
+ (DISABLE_DEPRECATED_API): Add Automake conditional.
+ (AC_CONFIG_FILES): Remove tools/{m4,extra_defs_gen}/Makefile and
+ {atk,gdk,gtk}/{atk,gdk,gtk}mm/private/Makefile.
+ * tools/Makefile.am: Non-recursively build the contents of all
+ subdirectories.
+ * tools/m4/filelist.am: Overhaul for new build system and rename
+ file from Makefile_list_of_sources.am_fragment to filelist.am.
+ * tools/Makefile_list_of_sources.am_fragment: Delete file.
+ * tools/extra_defs_gen/Makefile.am: Delete recursive Makefile.
+ * tools/m4/Makefile.am: ditto.
+ * tools/README, tools/TODO: Delete unhelpful and obsolete files.
+ * {atk,gdk,gtk}/src/filelist.am: Adapt file lists to new mm-common
+ build organization and rename from Makefile_list_of_hg.am_fragment
+ to filelist.am.
+ * {atk,gdk,gtk}/{atk,gdk,gtk}mm/filelist.am: New files defining the
+ lists of source files to compile and include in the libraries.
+ * {atk,gdk,gtk}/src/Makefile.am: Rewrite based upon the new build
+ support files from mm-common.
+ * {atk,gdk,gtk}/{atk,gdk,gtk}mm/Makefile.am: ditto.
+ * {atk,gdk,gtk}/{atk,gdk,gtk}mm/private/Makefile.am: Delete files.
+ * build_shared/*.am_fragment: Delete obsolete build support files.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Do not recurse into MSVC or NSI subdirectories
+
+ * configure.ac (AC_CONFIG_FILES): Remove the output files
+ MSVC_Net200[58]/**/Makefile and win32_installer/**/Makefile.
+ (AC_CONFIG_COMMANDS): Append custom commands to config.status to
+ copy the generated header files into the MSVC subdirectories. Do
+ the same for COPYING, which is copied to win32_installer/lgpl.txt.
+ * MSVC_Net200[58]/filelist.am: New Automake include files.
+ * win32_installer/filelist.am: New Automake include file.
+ * Makefile.am: Include the file lists MSVC_Net200[58]/filelist.am
+ and win32_installer/filelist.am.
+ (SUBDIRS): Do not recurse into MSVC_Net200[58]/ or win32_installer/
+ subdirectories.
+ (dist_noinst_DATA): Distribute the MSVC and Windows installer data
+ files from here.
+ (DISTCLEANFILES): Delete file copies from subdirectories.
+ * MSVC_Net200[58]/**/Makefile.am: Delete now unused build files.
+ * win32_installer/**/Makefile.am: ditto.
+ * win32_installer/gtkmm-installer.nsi.in (PRODUCT_API_VERSION):
+ Substitute @GTKMM_API_VERSION@ and remove the TODO comment.
+ (PRODUCT_VERSION): Substitute @PACKAGE_VERSION
+ * win32_installer/install-msvc-module: Fix the incorrectly applied
+ shell quoting throughout the file. Replace cascade of 'if test'
+ and 'elif test' constructs with a straightforward 'case ... in'.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Skip over intermediate subdir in recursion
+
+ * configure.ac (AC_CONFIG_FILES): Remove {atk,gdk,gtk}/Makefile.
+ (AC_CONFIG_HEADERS): Bring back gdkmmconfig.h.
+ * Makefile.am (SUBDIRS): Skip over {atk,gdk,gtk}/ and recurse
+ directly into {atk,gdk,gtk}/src and {atk,gdk,gtk}/{atk,gdk,gtk}mm.
+ Reorganize the conditional inclusion of atkmm in the build.
+ ({atk,gdk,gtk}mm_include_HEADERS): Install *mm.h central headers.
+ (nodist_g[dt]kmm_libinclude_HEADERS): Install *mmconfig.h headers.
+ (nodist_pkgconfig_DATA): Install pkg-config metadata files.
+ * {atk,gdk,gtk}/Makefile.am: Delete now unused files.
+ * {atk,gdk,gtk}/README: Delete either empty or unhelpful files.
+
+ 2009-08-12 Daniel Elstner <danielk openismus com>
+
+ Begin transition to mm-common build system
+
+ * autogen.sh: Replace with minimal script already used in pangomm,
+ only invoking mm-common-prepare, autoreconf and configure.
+ * configure.ac: Overhaul and remove large chunks of unnecessary,
+ inappropriate or broken tests and actions. Start using shared
+ macros from mm-common to simplify matters. Insert some dummy
+ substitutions and Automake conditional to keep the tree building.
+ * Makefile.am (ACLOCAL_AMFLAGS): Define for autoreconf to work.
+ (SUBDIRS): Temporary adjustments to keep the tree building.
+ * config.h.in: Delete file, and have autoheader generate it.
+
+ 2009-07-31 Johannes Schmid <jschmid openismus com>
+
+ * gtk/src/builder.hg:
+ * gtk/src/builder.ccg:
+ #590353 - GtkBuilder header is inconsistent in exception/error handling
+
+ 2009-07-23 Murray Cumming <murrayc murrayc com>
+
+ Gtk::Builder: Fix a crash when the widget is not found.
+
+ * gtk/src/builder.ccg: get_widget_checked(): Prevent a crash if the widget
+ was not found by GtkBuilder.
+ Bug #589267 (Alexander Shaduri)
+
+ 2.17.2:
+
+ 2009-07-13 Murray Cumming <murrayc murrayc com>
+
+ Fixed the build.
+
+ * tools/m4/convert_gtk.m4: Added conversions now needed in gdk/src/pixbuf.hg.
+
+ 2009-07-08 Daniel Elstner <danielk openismus com>
+
+ Correct base type check in Container_Class::remove_callback()
+
+ * gtk/src/container.ccg (Gtk::Container_Class::remove_callback):
+ In order to test for the abstract GtkContainer parent class, actually
+ compare against the parent type instead of making invalid assumptions
+ about the derived type. By means of the alternative Glib::ObjectBase
+ constructor, it is possible to create a custom GObject type different
+ from the standard one.
+
+ 2008-03-08 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/container.ccg: remove_callback(): When just calling the C
+ callback, because the C++ object has already been destroyed, don't
+ even call the C callback if the GType is exactly GtkContainer. This
+ avoids a useless warning from GTK+ about an unimplemented remove()
+ default signal handler. This happens when deriving from Gtk::Container -
+ remove() really is implemented - it's just that we don't call our own
+ implementation when that would be impossible.
+ Bug #518002 (Jonathon Jongsma).
+
+ 2009-06-29 Jonathon Jongsma <jonathon quotidian org>
+
+ * configure.ac:
+ * gdk/src/pixbuf.ccg:
+ * gdk/src/pixbuf.hg:
+ * tools/m4/convert_gdk.m4: add Gdk::Pixbuf::create_for_stream() and
+ create_for_stream_at_scale() for reading pixbufs from Gio file
+ streams
+
+ 2.17.1:
+
+ 2009-06-22 Hubert Figuiere <hub figuiere net>
+
+ * gtk/src/treepath.ccg: Gtk::TreePath::empty() must
+ return true if gobj_ is NULL. Bug #586437.
+
+ 2009-06-22 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/infobar.[hg|ccg]: Added InfoBar.
+
+ This is the master branch, for gtkmm 2.18, wrapping GTK+ 2.18.
+ See also the gtkmm-2-16 branch.
+
+ 2009-06-19 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with GTK+ 2.17.x
+
+ * gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+ * tools/m4/convert_gtk.m4: Add a conversion because a
+ gtk_recent_info_get_application_info() parameter's constness has changed.
+
+ 2009-06-16 Hakim Bellam <hakim bellam gmail com>
+
+ * gtk/src/recentmanager.ccg: add_item(): Correct a memory allocation to
+ avoid a crash later. Bug #585521.
+
+ 2009-06-14 Armin Burgmeier <armin openismus com>
+
+ * win32_installer/gtkmm-installer.nsi.in: Don't create a broken
+ zlib1.dll in the redist/ directory after installation (Kamil
+ Pawlowski).
+
+ 2009-05-31 Armin Burgmeier <armin openismus com>
+
+ * win32_installer/gtkmm-installer.nsi.in: Make sure to uninstall all
+ installed files, a few files were missing (Tao Wang).
+
+ 2009-05-31 Armin Burgmeier <armin openismus com>
+
+ * configure.ac: Define GTKMM_STATIC_LIB when a static gtkmm library is
+ built.
+
+ * gtk/gtkmmconfig.h.in: Define GTKMM_DLL on Windows when building a
+ DLL, instead of using GLIBMM_DLL, so that it's possible to build
+ glibmm as a static library and gtkmm as a DLL, or vice versa. Bug
+ #583657.
+
+ 2009-05-18 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/iconview.hg: get_model(): Use refreturn to correct the ref-counting.
+ Bug #583037 (Santanu Sinha).
+
+ 2009-05-05 Murray Cumming <murrayc murrayc com>
+
+ Gtk::SelectionData::get_uris() documentation fix.
+
+ * gtk/src/gtk_docs_override.xml: Add an override for
+ gtk_selection_data_get_uris() because the C documentation mentions freeing
+ strings.
+
+ 2009-05-05 Johannes Schmid <jschmid openismus com>
+
+ * gtk/gtkmm/box.ccg:
+ * tests/boxhelper/main.c
+ * tests/boxhelper/Makefile.am
+ * tests/Makefile.am
+ * configure.ac:
+ Fixed 466853 â?? Gtk::Box_Helpers::BoxList::insert() has wrong
+ return value
+ and added testcase
+
+ 2009-04-28 Johannes Schmid <jschmid openismus com>
+
+ * gtk/gtkmm/stock.h:
+ * gtk/gtkmm/stockitem.h:
+ * gtk/src/iconset.hg:
+ 506885 â?? Stock ID stuff needs documentation
+
+ Document as much as there is information available from the Gtk+ documentation
+
+ 2009-04-27 Johannes Schmid <jschmid openismus com>
+
+ * gtk/src/statusicon.ccg: get_geometry():
+ Reference the returned statusicon because the RefPtr becomes invalid
+ otherwise (#575268)
+
2009-04-18 Daniel Elstner <danielk openismus com>
* docs/reference/images/stock: Add these stock images to the repository for
diff --cc gdk/gdkmm/general.h
index 33ed156,b5959a6..3c75397
--- a/gdk/gdkmm/general.h
+++ b/gdk/gdkmm/general.h
@@@ -42,47 -42,116 +42,70 @@@ namespace Cair
* @param @context The cairo context.
* @param color The color to use as the source color.
*
- * @newin2p12
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
-void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color);
-#endif
-
-/** Sets the specified Gdk::Color as the source color of the Cairo context.
- * @param @context The cairo context.
- * @param color The color to use as the source color.
- *
- * @newin{2,12}
- */
void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color);
++#endif
+ #ifndef GDKMM_DISABLE_DEPRECATED
/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y.
* @param @context The cairo context.
* @param pixbuf A Gdk::Pixbuf
* @param pixbuf_x X coordinate of location to place upper left corner of pixbuf.
* @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf.
*
- * @newin2p12
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
-void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y);
-#endif
-
-/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y.
- * @param @context The cairo context.
- * @param pixbuf A Gdk::Pixbuf
- * @param pixbuf_x X coordinate of location to place upper left corner of pixbuf.
- * @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf.
- *
- * @newin{2,12}
- */
void set_source_pixbuf(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y);
++#endif
+ #ifndef GDKMM_DISABLE_DEPRECATED
/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y.
* @param @context The cairo context.
* @param pixmap A Gdk::Pixmap
* @param pixmap_x X coordinate of location to place upper left corner of pixmap.
* @param pixmap_y Y coordinate of location to place upper left corner of pixmap.
*
- * @newin2p12
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
-void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y);
-#endif
-
-/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y.
- * @param @context The cairo context.
- * @param pixmap A Gdk::Pixmap
- * @param pixmap_x X coordinate of location to place upper left corner of pixmap.
- * @param pixmap_y Y coordinate of location to place upper left corner of pixmap.
- *
- * @newin{2,12}
- */
void set_source_pixmap(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y);
++#endif
+ #ifndef GDKMM_DISABLE_DEPRECATED
/** Adds the given rectangle to the current path of the context.
*
* @param context A cairo context.
* @param rectangle A rectangle to add to the path of the context.
*
- * @newin2p12
+ * @deprecated Use add_rectangle_to_path() instead
+ * reference.
+ *
+ * @newin{2,10}
*/
-void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle);
-#endif
-
-/** Adds the given rectangle to the current path of the context.
- *
- * @param context A cairo context.
- * @param rectangle A rectangle to add to the path of the context.
- *
- * @newin{2,12}
- */
void add_rectangle_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle);
++#endif
+ #ifndef GDKMM_DISABLE_DEPRECATED
/** Adds the given region to the current path of the context.
*
* @param context A cairo context.
* @param region A region to add to the path of the context.
*
- * @newin2p12
+ * @deprecated Use add_region_to_path() instead
+ *
+ * @newin{2,10}
*/
-void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region);
-#endif
-
-/** Adds the given region to the current path of the context.
- *
- * @param context A cairo context.
- * @param region A region to add to the path of the context.
- *
- * @newin{2,12}
- */
void add_region_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region);
++#endif
} //namespace Cairo
diff --cc gdk/src/display.hg
index 79d4087,a02f5ca..ceed14e
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@@ -140,8 -140,26 +140,24 @@@ public
_WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn)
- _WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
+ #ifdef G_OS_WIN32
+ /** Finds out the DND protocol supported by a window.
+ *
+ * @newin{2,2}
+ * @deprecated
+ * @param xid The X id of the destination window.
+ * @param protocol Location where the supported DND protocol is returned.
+ * @return The X id of the window where the drop should happen. This
+ * may be @a xid or the X id of a proxy window, or None if @a xid doesn't
+ * support Drag and Drop.
+ *
+ * On Windows, GdkNativeWindow is not the same as guint32, so we keep the
+ * guint32 variant for ABI compatibility. On Linux, it is the same, and they
+ * can't be overloaded therefore. But the ABI stays the same anyway.
+ */
- guint32 get_drag_protocol(guint32 xid, GdkDragProtocol& protocol);
++ WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
+ #endif
- _WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
-
_WRAP_METHOD(GdkKeymap* get_keymap(), gdk_keymap_get_for_display)
_WRAP_METHOD(const GdkKeymap* get_keymap() const, gdk_keymap_get_for_display, constversion)
diff --cc gdk/src/window.hg
index 2588e7d,cb86d08..a702d0e
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@@ -122,8 -138,10 +138,7 @@@ public
_WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, WindowHints geom_mask), gdk_window_set_geometry_hints)
_WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id)
static void unset_sm_client_id();
-
-
- //Note: The rectangle parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
- #m4 _CONVERSION(`Rectangle&',`const GdkRectangle*',`($3).gobj()')
- _WRAP_METHOD(void begin_paint_rect(Rectangle& rectangle), gdk_window_begin_paint_rect)
+ _WRAP_METHOD(void begin_paint_rect(const Rectangle& rectangle), gdk_window_begin_paint_rect)
_WRAP_METHOD(void begin_paint_region(const Region& region), gdk_window_begin_paint_region)
_WRAP_METHOD(void end_paint(), gdk_window_end_paint)
_WRAP_METHOD(void set_title(const Glib::ustring& title), gdk_window_set_title)
diff --cc gtk/src/action.hg
index 539452b,2b5eb78..aa91f43
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@@ -57,21 -59,18 +59,21 @@@ class Image
* - visible (shown/hidden)
* - sensitive (enabled/disabled)
*
- * Apart from regular actions, there are toggle actions,
- * which can be toggled between two states and radio actions,
- * of which only one in a group can be in the "active" state.
+ * Apart from regular actions, there are toggle actions,
+ * which can be toggled between two states and radio actions,
+ * of which only one in a group can be in the "active" state.
* Other actions can be implemented as Gtk::Action subclasses.
- *
- * Each action can have one or more proxy menu item, toolbar button or other proxy widgets.
+ *
+ * Each action can have one or more proxy menu item, toolbar button or other proxy widgets.
* Proxies mirror the state of the action (text label, tooltip, icon, visible, sensitive, etc), and should change when the action's state changes. When the proxy is activated, it should activate its action.
*/
-class Action : public Glib::Object
+class Action
+ : public Glib::Object,
+ public Buildable
{
_CLASS_GOBJECT(Action, GtkAction, GTK_ACTION, Glib::Object, GObject)
+ _IMPLEMENTS_INTERFACE(Buildable)
-
+
protected:
/** Creates an empty action. */
_CTOR_DEFAULT
@@@ -227,11 -226,12 +229,10 @@@ public
_WRAP_PROPERTY("visible", bool)
_WRAP_PROPERTY("action_group", Glib::RefPtr<ActionGroup>)
-
protected:
- //For use by child actions:
- _WRAP_METHOD(void block_activate_from(Widget& proxy), gtk_action_block_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
- _WRAP_METHOD(void unblock_activate_from(Widget& proxy), gtk_action_unblock_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
+ _IGNORE(gtk_action_block_activate_from, gtk_action_unblock_activate_from) //deprecated
- protected:
+ protected:
//Widget-creation routines:
_WRAP_VFUNC(Widget* create_menu_item(), "create_menu_item")
_WRAP_VFUNC(Widget* create_tool_item(), "create_tool_item")
diff --cc gtk/src/cellrenderer.hg
index 74e2956,8e0df05..7af542a
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@@ -90,8 -92,19 +92,19 @@@ public
_WRAP_METHOD(void set_fixed_size(int width, int height), gtk_cell_renderer_set_fixed_size)
_WRAP_METHOD(void get_fixed_size(int& width, int& height) const, gtk_cell_renderer_get_fixed_size)
- _IGNORE(gtk_cell_renderer_editing_canceled)
++ _IGNORE(gtk_cell_renderer_editing_canceled) //deprecated
++
+ _WRAP_METHOD(void set_alignment(float align, float yalign), gtk_cell_renderer_set_alignment)
+ _WRAP_METHOD(void get_alignment(float& xalign, float& yalign) const, gtk_cell_renderer_get_alignment)
+
+ _WRAP_METHOD(void set_padding(int xpad, int ypad), gtk_cell_renderer_set_padding)
+ _WRAP_METHOD(void get_padding(int& xpad, int& ypad) const, gtk_cell_renderer_get_padding)
+
+ _WRAP_METHOD(void set_visible(bool visible = true), gtk_cell_renderer_set_visible)
+ _WRAP_METHOD(bool get_visible() const, gtk_cell_renderer_get_visible)
+ _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_cell_renderer_set_sensitive)
+ _WRAP_METHOD(bool get_sensitive() const, gtk_cell_renderer_get_sensitive)
- _WRAP_METHOD(void editing_canceled(), gtk_cell_renderer_editing_canceled, deprecated "Use stop_editing().")
-
_WRAP_METHOD(void stop_editing(bool canceled = false), gtk_cell_renderer_stop_editing)
/** Returns the property that this CellRenderer renders.
@@@ -106,14 -119,16 +119,14 @@@
/** This signal is emitted when the user cancels the process of editing a
* cell. For example, an editable cell renderer could be written to cancel
- * editing when the user presses Escape.
+ * editing when the user presses Escape.
*
- * @see editing_canceled()
+ * @see editing_canceled()
*/
_WRAP_SIGNAL(void editing_canceled(), editing_canceled)
-
+
#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
- //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
- //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
//TODO: Remove the warning in the documentation when we have fixed the inheritance of CellRendererCombo.
/** This signal gets emitted when a cell starts to be edited.
* The indended use of this signal is to do special setup
diff --cc gtk/src/filechooser.hg
index 0d37077,ab7b83d..2388383
--- a/gtk/src/filechooser.hg
+++ b/gtk/src/filechooser.hg
@@@ -80,19 -91,19 +80,22 @@@ public
_WRAP_METHOD(void set_do_overwrite_confirmation(bool do_overwrite_confirmation = true), gtk_file_chooser_set_do_overwrite_confirmation)
_WRAP_METHOD(bool get_do_overwrite_confirmation() const, gtk_file_chooser_get_do_overwrite_confirmation)
+ _WRAP_METHOD(void set_create_folders(bool create_folders = true), gtk_file_chooser_set_create_folders)
+ _WRAP_METHOD(bool get_create_folders() const, gtk_file_chooser_get_create_folders)
+
_WRAP_METHOD(void set_current_name(const Glib::ustring& name), gtk_file_chooser_set_current_name)
- _WRAP_METHOD(Glib::ustring get_filename() const, gtk_file_chooser_get_filename)
- _WRAP_METHOD(bool set_filename(const Glib::ustring& filename), gtk_file_chooser_set_filename)
- _WRAP_METHOD(bool select_filename(const Glib::ustring& filename), gtk_file_chooser_select_filename)
- _WRAP_METHOD(void unselect_filename(const Glib::ustring& filename), gtk_file_chooser_unselect_filename)
+ _WRAP_METHOD(std::string get_filename() const, gtk_file_chooser_get_filename)
+ _WRAP_METHOD(bool set_filename(const std::string& filename), gtk_file_chooser_set_filename)
+ _WRAP_METHOD(bool select_filename(const std::string& filename), gtk_file_chooser_select_filename)
+ _WRAP_METHOD(void unselect_filename(const std::string& filename), gtk_file_chooser_unselect_filename)
_WRAP_METHOD(void select_all(), gtk_file_chooser_select_all)
_WRAP_METHOD(void unselect_all(), gtk_file_chooser_unselect_all)
- _WRAP_METHOD(Glib::SListHandle<Glib::ustring> get_filenames() const, gtk_file_chooser_get_filenames)
- _WRAP_METHOD(bool set_current_folder(const Glib::ustring& filename), gtk_file_chooser_set_current_folder)
- _WRAP_METHOD(Glib::ustring get_current_folder() const, gtk_file_chooser_get_current_folder)
+
+#m4 _CONVERSION(`GSList*',`Glib::SListHandle<std::string>',__FL2H_DEEP)
+ _WRAP_METHOD(Glib::SListHandle<std::string> get_filenames() const, gtk_file_chooser_get_filenames)
+
+ _WRAP_METHOD(bool set_current_folder(const std::string& filename), gtk_file_chooser_set_current_folder)
+ _WRAP_METHOD(std::string get_current_folder() const, gtk_file_chooser_get_current_folder)
/* URI manipulation
diff --cc gtk/src/filelist.am
index 0000000,0349ece..63c15f2
mode 000000,100644..100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@@ -1,0 -1,199 +1,197 @@@
+ ## This file is part of gtkmm.
+
+ gtkmm_files_defs = \
+ gtk.defs \
+ gtk_enums.defs \
+ gtk_enums_maemo.defs \
+ gtk_methods.defs \
+ gtk_methods_maemo.defs \
+ gtk_other.defs \
+ gtk_signals.defs \
+ gtk_vfuncs.defs \
+ gtk_docs.xml \
+ gtk_docs_override.xml
+
+ gtkmm_files_any_hg = \
+ aboutdialog.hg \
+ accelgroup.hg \
+ accellabel.hg \
+ action.hg \
+ actiongroup.hg \
+ activatable.hg \
+ adjustment.hg \
+ alignment.hg \
+ arrow.hg \
+ aspectframe.hg \
+ assistant.hg \
+ bin.hg \
+ box.hg \
++ buildable.hg \
+ builder.hg \
+ button.hg \
+ buttonbox.hg \
+ calendar.hg \
+ celleditable.hg \
+ celllayout.hg \
+ cellrenderer.hg \
+ cellrendereraccel.hg \
+ cellrenderercombo.hg \
+ cellrendererpixbuf.hg \
+ cellrendererprogress.hg \
+ cellrendererspin.hg \
+ cellrenderertext.hg \
+ cellrenderertoggle.hg \
+ cellview.hg \
+ checkbutton.hg \
+ checkmenuitem.hg \
+ clipboard.hg \
+ colorbutton.hg \
+ colorselection.hg \
+ combobox.hg \
+ comboboxentry.hg \
+ container.hg \
+ curve.hg \
+ dialog.hg \
+ drawingarea.hg \
+ editable.hg \
+ entry.hg \
+ entrycompletion.hg \
+ enums.hg \
+ eventbox.hg \
+ expander.hg \
+ filechooser.hg \
+ filechooserbutton.hg \
+ filechooserdialog.hg \
+ filechooserwidget.hg \
+ filefilter.hg \
- fileselection.hg \
+ fixed.hg \
+ fontbutton.hg \
+ fontselection.hg \
+ frame.hg \
+ handlebox.hg \
+ iconfactory.hg \
+ iconinfo.hg \
+ iconset.hg \
+ iconsource.hg \
+ icontheme.hg \
+ iconview.hg \
+ image.hg \
+ imagemenuitem.hg \
+ infobar.hg \
+ inputdialog.hg \
+ invisible.hg \
+ item.hg \
+ label.hg \
+ layout.hg \
+ linkbutton.hg \
+ liststore.hg \
+ main.hg \
+ menu.hg \
+ menubar.hg \
+ menuitem.hg \
+ menushell.hg \
+ menutoolbutton.hg \
+ messagedialog.hg \
+ misc.hg \
+ notebook.hg \
+ object.hg \
- optionmenu.hg \
+ orientable.hg \
+ pagesetup.hg \
+ paned.hg \
+ papersize.hg \
+ plug.hg \
+ printcontext.hg \
+ printoperation.hg \
+ printoperationpreview.hg\
+ printsettings.hg \
+ progressbar.hg \
+ radioaction.hg \
+ radiobutton.hg \
+ radiomenuitem.hg \
+ radiotoolbutton.hg \
+ range.hg \
+ rc.hg \
+ recentaction.hg \
+ recentchooser.hg \
+ recentchooserdialog.hg \
+ recentchoosermenu.hg \
+ recentchooserwidget.hg \
+ recentfilter.hg \
+ recentinfo.hg \
+ recentmanager.hg \
+ ruler.hg \
+ scale.hg \
+ scalebutton.hg \
+ scrollbar.hg \
+ scrolledwindow.hg \
+ selectiondata.hg \
+ separator.hg \
+ separatormenuitem.hg \
+ separatortoolitem.hg \
+ settings.hg \
+ sizegroup.hg \
+ socket.hg \
+ spinbutton.hg \
+ statusbar.hg \
+ statusicon.hg \
+ stockitem.hg \
+ style.hg \
+ table.hg \
+ targetlist.hg \
+ tearoffmenuitem.hg \
+ textattributes.hg \
+ textbuffer.hg \
+ textchildanchor.hg \
+ textiter.hg \
+ textmark.hg \
+ texttag.hg \
+ texttagtable.hg \
+ textview.hg \
+ toggleaction.hg \
+ togglebutton.hg \
+ toggletoolbutton.hg \
+ toolbar.hg \
+ toolbutton.hg \
+ toolitem.hg \
+ toolshell.hg \
+ tooltip.hg \
- tooltips.hg \
+ treedragdest.hg \
+ treedragsource.hg \
+ treeiter.hg \
+ treemodel.hg \
+ treemodelfilter.hg \
+ treemodelsort.hg \
+ treepath.hg \
+ treerowreference.hg \
+ treeselection.hg \
+ treesortable.hg \
+ treestore.hg \
+ treeview.hg \
+ treeviewcolumn.hg \
+ uimanager.hg \
+ viewport.hg \
+ volumebutton.hg \
+ widget.hg \
+ window.hg
+
+ gtkmm_files_posix_hg = \
+ pagesetupunixdialog.hg \
+ printer.hg \
+ printjob.hg \
+ printunixdialog.hg
+
-gtkmm_files_deprecated_hg = combo.hg
++gtkmm_files_deprecated_hg =
+
+ if HOST_WINDOWS_NATIVE
+ gtkmm_files_arch_hg =
+ else
+ gtkmm_files_arch_hg = $(gtkmm_files_posix_hg)
+ endif
+ if DISABLE_DEPRECATED_API
+ gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg)
+ else
+ gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg) $(gtkmm_files_deprecated_hg)
+ endif
+
+ gtkmm_files_hg = $(gtkmm_files_any_hg) $(gtkmm_files_posix_hg) $(gtkmm_files_deprecated_hg)
+ gtkmm_files_ccg = $(gtkmm_files_hg:.hg=.ccg)
diff --cc gtk/src/menuitem.hg
index b362b47,6667b94..8cb4630
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@@ -40,14 -41,10 +40,13 @@@ namespace Menu_Helpers { class Element
* @ingroup Widgets
* @ingroup Menus
*/
-class MenuItem : public Item
+class MenuItem
+ : public Item,
+ public Activatable
{
_CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Item,GtkItem)
+ _IMPLEMENTS_INTERFACE(Activatable)
public:
-
/// Create an empty menu item
_CTOR_DEFAULT
@@@ -61,8 -59,8 +61,7 @@@
_WRAP_METHOD(Menu* get_submenu(), gtk_menu_item_get_submenu)
_WRAP_METHOD(const Menu* get_submenu() const, gtk_menu_item_get_submenu, constversion)
bool has_submenu() const;
--
- _WRAP_METHOD(void remove_submenu(), gtk_menu_item_remove_submenu, deprecated)
+ _IGNORE(gtk_menu_item_remove_submenu) //deprecated
_WRAP_METHOD(void select(), gtk_menu_item_select)
_WRAP_METHOD(void deselect(), gtk_menu_item_deselect)
_WRAP_METHOD(void activate(), gtk_menu_item_activate)
diff --cc gtk/src/menutoolbutton.hg
index 12084f5,f5c34e6..5195b41
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@@ -19,8 -16,14 +16,13 @@@
* 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/toolbutton.h>
#include <gtkmm/menu.h>
-#include <gtkmm/tooltips.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/toolbutton_p.h)
diff --cc gtk/src/pagesetup.hg
index 7b584ab,45486be..3c21d33
--- a/gtk/src/pagesetup.hg
+++ b/gtk/src/pagesetup.hg
@@@ -156,8 -156,21 +156,8 @@@ public
_WRAP_METHOD(bool save_to_file(const std::string& file_name) const, gtk_page_setup_to_file, errthrow)
#m4 _CONVERSION(`Glib::KeyFile&', `GKeyFile*', __FR2P)
- _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_page_setup_to_key_file)
- _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name), gtk_page_setup_to_key_file, deprecated "Use the const version.")
+ _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_page_setup_to_key_file)
- #ifndef GTKMM_DISABLE_DEPRECATED
- /** This function adds the page setup from @a setup to @a key_file,
- * in the group "Page Setup"
- *
- * @newin{2,12}
- * @param key_file The G::KeyFile to save the page setup to.
- *
- * @deprecated Use the const version.
- */
- void save_to_key_file(Glib::KeyFile& key_file);
- #endif //GTKMM_DISABLE_DEPRECATED
-
/** This function adds the page setup from @a setup to @a key_file,
* in the group "Page Setup"
*
diff --cc gtk/src/scalebutton.hg
index 3bf2c55,c191037..9328016
--- a/gtk/src/scalebutton.hg
+++ b/gtk/src/scalebutton.hg
@@@ -19,9 -16,13 +16,14 @@@
* 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/button.h>
#include <gtkmm/adjustment.h>
+#include <gtkmm/orientable.h>
#include <gtkmm/enums.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/button_p.h)
@@@ -29,24 -30,22 +31,23 @@@
namespace Gtk
{
-//TODO: Inherit/Implement Orientation when we can break ABI.
-
/** A button which pops up a scale widget.
*
- * This kind of widget is commonly used for volume controls in multimedia
- * applications, and there is a Gtk::VolumeButton subclass that is tailored
+ * This kind of widget is commonly used for volume controls in multimedia
+ * applications, and there is a Gtk::VolumeButton subclass that is tailored
* for this use case.
- *
+ *
* @ingroup Widgets
- * @newin2p12
+ * @newin{2,12}
*/
-class ScaleButton : public Button
+class ScaleButton
+ : public Button,
+ public Orientable
{
_CLASS_GTKOBJECT(ScaleButton, GtkScaleButton, GTK_SCALE_BUTTON, Gtk::Button, GtkButton)
+ _IMPLEMENTS_INTERFACE(Orientable)
+
public:
-
_WRAP_CTOR(ScaleButton(IconSize size, double min, double max, double step, const Glib::StringArrayHandle& icons), gtk_scale_button_new)
_WRAP_METHOD(void set_icons(const Glib::StringArrayHandle& icons), gtk_scale_button_set_icons)
diff --cc gtk/src/statusicon.hg
index 3d6a7de,c0e5add..e806376
--- a/gtk/src/statusicon.hg
+++ b/gtk/src/statusicon.hg
@@@ -178,11 -183,13 +183,12 @@@ public
_WRAP_SIGNAL(bool size_changed(int size), size_changed)
- //TODO: Remove no_default_handler when we can break ABI.
- _WRAP_SIGNAL(void activate(), activate, no_default_handler)
- _WRAP_SIGNAL(void popup_menu(guint button, guint32 activate_time), popup_menu, no_default_handler)
- _WRAP_SIGNAL(bool button_press_event(GdkEventButton* event), button_press_event, no_default_handler)
- _WRAP_SIGNAL(bool button_release_event(GdkEventButton* event), button_release_event, no_default_handler)
- _WRAP_SIGNAL(bool scroll_event(GdkEventScroll* event), scroll_event, no_default_handler)
- _WRAP_SIGNAL(bool query_tooltip(int x, int y, bool keyboard_mode, const Glib::RefPtr<Tooltip>& tooltip), query_tooltip, no_default_handler)
+ _WRAP_SIGNAL(void activate(), activate)
+ _WRAP_SIGNAL(void popup_menu(guint button, guint32 activate_time), popup_menu)
+ _WRAP_SIGNAL(bool button_press_event(GdkEventButton* event), button_press_event)
+ _WRAP_SIGNAL(bool button_release_event(GdkEventButton* event), button_release_event)
+ _WRAP_SIGNAL(bool scroll_event(GdkEventScroll* event), scroll_event)
++ _WRAP_SIGNAL(bool query_tooltip(int x, int y, bool keyboard_mode, const Glib::RefPtr<Tooltip>& tooltip), query_tooltip)
};
} // namespace Gtk
diff --cc gtk/src/toolbar.hg
index 3b15d99,b5070b7..c5bdabf
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@@ -76,11 -75,12 +75,11 @@@ public
_WRAP_METHOD(void set_toolbar_style(ToolbarStyle style), gtk_toolbar_set_style)
_WRAP_METHOD(ToolbarStyle get_toolbar_style() const, gtk_toolbar_get_style)
- _WRAP_METHOD(void set_tooltips(bool enable = true), gtk_toolbar_set_tooltips, deprecated "Use The toolkit-wide Gtk::Settings::property_gtk_enable_tooltips instead")
- _WRAP_METHOD(bool get_tooltips() const, gtk_toolbar_get_tooltips, deprecated "Use The toolkit-wide Gtk::Settings::property_gtk_enable_tooltips instead")
+ _IGNORE(gtk_toolbar_set_tooltips, gtk_toolbar_get_tooltips) //deprecated
_WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style)
-
- //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
+
+ //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
//deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
_WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_toolbar_set_icon_size)
_WRAP_METHOD(void unset_icon_size(), gtk_toolbar_unset_icon_size)
@@@ -119,10 -119,16 +118,10 @@@
* @resultt true if the signal was handled, false if not.
*/
_WRAP_SIGNAL(bool popup_context_menu(int x, int y, int button_number), "popup_context_menu")
-
+
_IGNORE_SIGNAL("move_focus")
_IGNORE_SIGNAL("focus_home_or_end")
-
+
- #ifndef GTKMM_DISABLE_DEPRECATED
- //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
- ///@deprecated Use the Gtk::Tooltip API instead.
- Tooltips* get_tooltips_object() const;
- #endif //GTKMM_DISABLE_DEPRECATED
-
//This is probably the same as Container::children().size(), which is deprecated anyway?
//_MEMBER_GET(num_children, num_children, int, gint)
diff --cc gtk/src/toolbutton.hg
index 006847d,ec56e9c..43ab7b3
--- a/gtk/src/toolbutton.hg
+++ b/gtk/src/toolbutton.hg
@@@ -26,9 -23,10 +23,8 @@@ _PINCLUDE(gtkmm/private/toolitem_p.h
namespace Gtk
{
-// TODO: Inherit/Implement Activatable when we can break ABI.
-
/** A Gtk::ToolItem subclass that displays buttons.
- *
+ *
* A ToolButton is are Gtk::ToolItem containing a button.
* @ingroup Widgets
*/
diff --cc gtk/src/toolitem.hg
index 567d199,ede226d..9b9a85f
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@@ -32,17 -31,12 +32,15 @@@ _PINCLUDE(gtkmm/private/bin_p.h
namespace Gtk
{
- /**
- *
+ /**
* @ingroup Widgets
*/
-class ToolItem : public Bin
+class ToolItem
+ : public Bin,
+ public Activatable
{
_CLASS_GTKOBJECT(ToolItem, GtkToolItem, GTK_TOOL_ITEM, Gtk::Bin, GtkBin)
+ _IMPLEMENTS_INTERFACE(Activatable)
public:
_CTOR_DEFAULT
diff --cc gtk/src/treeview.hg
index 463c3ad,409fd1c..42c08d1
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@@ -553,11 -561,15 +554,9 @@@ public
_WRAP_METHOD(void get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const, gtk_tree_view_get_background_area)
//We ignore the fact that one of the arguments can be 0 - it does not seem useful.
- _WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect), gtk_tree_view_get_visible_rect, deprecated "Use the const version.")
_WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_tree_view_get_visible_rect)
- _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const, gtk_tree_view_widget_to_tree_coords)
-
- _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords)
- _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty), gtk_tree_view_widget_to_tree_coords, deprecated "Use the const version")
- _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const, gtk_tree_view_widget_to_tree_coords, deprecated)
-
- _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy), gtk_tree_view_tree_to_widget_coords, deprecated "Use the const version.")
- _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords, deprecated)
++ _IGNORE(gtk_tree_view_widget_to_tree_coords, gtk_tree_view_tree_to_widget_coords) //deprecated
bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
_IGNORE(gtk_tree_view_get_visible_range)
diff --cc gtk/src/treeviewcolumn.hg
index 27fb4a4,8a003a4..af138fa
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@@ -39,11 -38,12 +39,10 @@@ namespace Gt
_CC_INCLUDE(gtk/gtk.h)
_WRAP_ENUM(TreeViewColumnSizing, GtkTreeViewColumnSizing)
-
- // We use GTKMM_API here because gcc needs the extra help on win32 , even
- // when using --export-all and auto-import.
+ // We use GTKMM_API here because gcc needs the extra help on win32 , even
+ // when using --export-all and auto-import.
// See http://bugzilla.gnome.org/show_bug.cgi?id=309030.
-//TODO: This should derive+implement from CellLayout when we can break ABI.
-
class TreeView;
/** Typedefed as Gtk::TreeView::Column.
diff --cc gtk/src/widget.hg
index d98a8b8,bbba782..01b93e6
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@@ -478,10 -508,10 +508,9 @@@ public
_WRAP_METHOD(Glib::ListHandle<const Widget*> list_mnemonic_labels() const, gtk_widget_list_mnemonic_labels)
_WRAP_METHOD(void add_mnemonic_label(Widget& label), gtk_widget_add_mnemonic_label)
_WRAP_METHOD(void remove_mnemonic_label(Widget& label), gtk_widget_remove_mnemonic_label)
-
//TODO: Should drag_get_data() be const?
- _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
- _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, Glib::ustring& target, guint32 time), gtk_drag_get_data, deprecated "Use the version with the const target parameter.")
+ _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
_WRAP_METHOD(void drag_highlight(), gtk_drag_highlight)
_WRAP_METHOD(void drag_unhighlight(), gtk_drag_unhighlight)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
