[gtkmm/gtkmm-3maybe: 35/35] Fixed merge conflicts from master.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3maybe: 35/35] Fixed merge conflicts from master.
- Date: Mon, 17 May 2010 22:08:32 +0000 (UTC)
commit 92eb76170101489467fc10827479ffe4ac9109e7
Merge: 1fff703 edf8631
Author: Murray Cumming <murrayc murrayc com>
Date: Tue May 18 00:08:14 2010 +0200
Fixed merge conflicts from master.
ChangeLog | 201 +
MSVC_Net2005/gtkmm/gtkmm.vcproj | 48 +
MSVC_Net2008/gtkmm/gtkmm.vcproj | 48 +
NEWS | 120 +-
atk/src/atk_docs.xml | 1163 +-
configure.ac | 4 +-
demos/Makefile.am | 2 +-
demos/gtk-demo/example_colorsel.cc | 4 +-
demos/gtk-demo/example_uimanager.cc | 2 +-
docs/Makefile.am | 3 +-
gdk/src/filelist.am | 2 +-
gdk/src/gdk.defs | 2 +-
gdk/src/gdk_docs.xml | 7405 ++----
gdk/src/gdk_docs_override.xml | 20 +-
gdk/src/gdk_methods.defs | 1077 +-
.../{gdk_pixbuf.defs => gdk_pixbuf_methods.defs} | 101 +-
gdk/src/screen.hg | 1 +
gdk/src/window.hg | 1 +
gtk/gtkmm.h | 75 +-
gtk/src/box.hg | 1 +
gtk/src/builder.hg | 68 +-
gtk/src/filechooser.hg | 4 +-
gtk/src/gtk_docs.xml |30759 +++++++++-----------
gtk/src/gtk_docs_override.xml | 8 +-
gtk/src/gtk_signals.defs | 810 +
gtk/src/offscreenwindow.hg | 4 +
gtk/src/range.hg | 2 +-
gtk/src/recentaction.hg | 4 +-
gtk/src/spinner.hg | 1 +
gtk/src/statusbar.hg | 5 +
gtk/src/toolbar.hg | 12 -
gtk/src/toolitem.hg | 8 +
gtk/src/toolitemgroup.hg | 11 +-
gtk/src/toolpalette.hg | 6 +-
gtk/src/toolshell.hg | 9 +-
gtk/src/treerowreference.hg | 4 +-
gtkmm.doap | 2 +
tools/extra_defs_gen/generate_defs_gtk.cc | 3 +
tools/m4/convert_gtk.m4 | 2 +
win32_installer/gtkmm-installer.nsi.in | 190 +-
win32_installer/gtkmm-vc80-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc80-d-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc90-2_4.vsprops | 2 +-
win32_installer/gtkmm-vc90-d-2_4.vsprops | 2 +-
win32_installer/install-msvc-module | 14 +-
45 files changed, 18781 insertions(+), 23433 deletions(-)
---
diff --cc ChangeLog
index bd90ccf,cbed4fa..bc7253c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,201 +1,214 @@@
++<<<<<<< HEAD:ChangeLog
+2010-05-12 Murray Cumming <murrayc murrayc com>
+
+ Use gtk+ 3.0 instead of gtk+ 2.0.
+
+ * configure.ac: Change the pkg-config check from gtk+-2.0 to gtk+-3.0.
+ Change the gdkmm and gtkmm ABI version to 3.0, so people should change
+ their pkg-config checks to gtkmm-3.0.
+ * gtk/src/enums.hg: Remove GtkCurveType, which is not in gtk+ 3.0.
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Remove previously-deprecated
+ types that are not in gtk+ 3.0.
++=======
+ This is the gtkmm-2-20 branch. See the gtkmm-2-22 branch for new API
+ and see the master branch for the planned API/ABI-breaking gtkmm 3.
+
+ 2.20.3:
+
+ 2010-05-04 Murray Cumming <murrayc murrayc com>
+
+ FileChooser::get_filter(): Don't ref the result.
+
+ * gtk/src/filechooser.hg: get_filter(): Don't ref the GtkFilter results,
+ because it is a GtkObject, not just a GObject, and we should not
+ reference-count GtkObjects. This does _not_ fix bug #583481 though.
+
+ 2010-04-23 David King <davidk openismus com>
+
+ Improvements to main page documentation
+
+ * gtk/gtkmm.h: Links to groups and external websites. Compilation
+ example.
+
+ 2010-04-16 David King <davidk openismus com>
+
+ Add main page to Doxygen documentation
+
+ * docs/Makefile.am: Parse gtk/gtkmm.h for documentation.
+ * gtk/gtkmm.h: Add main page to Doxygen documentation.
+
+ 2.20.2:
+
+ 2010-04-13 José Alburquerque <jaalburqu svn gnome org>
+
+ gdk_docs.xml: Another regeneration because of parsing errors.
+
+ * gdk/src/gdk_docs.xml: Regenerate once more to avoid parsing errors
+ caused by &...; expressions that don't make sense to gmmproc.
+
+ 2010-04-11 José Alburquerque <jaalburqu svn gnome org>
+
+ Regenerate docs once more to fix comment errors.
+
+ * gdk/src/gdk_docs.xml:
+ * gtk/src/gtk_docs.xml: Regenerated after fixing the
+ docextract_to_xml.py script to handle C++ multi-line comments in
+ function descriptions that include sample C++ code.
+
+ 2010-04-11 José Alburquerque <jaalburqu svn gnome org>
+
+ Regenerate docs with the new docextract_to_xml.py script.
+
+ * atk/src/atk_docs.xml:
+ * gdk/src/gdk_docs.xml:
+ * gtk/src/gtk_docs.xml: Regenerated with the new documentation
+ extraction script to take advantage of the new generation method it
+ uses.
+
+ 2.20.1:
+
+ 2010-04-07 Murray Cumming <murrayc murrayc com>
+
+ Builder: Complete the exceptions thrown documentation.
+
+ * gtk/src/builder.hg: Completed the @throws lines now that GtkBuilder
+ has documentation about the GError domains that it throws.
+ This fixed bug #548022 (Alexander Shaduri).
+
+ 2010-04-07 Murray Cumming <murrayc mmurrayc com>
+
+ API reference documentation: Remove gobjection-introspection annotations.
+
+ * gdk/src/gdk_docs.xml:
+ * gtk/src/gtk_docs.xml: Use regexxer to remove the gobject-introspection
+ annotations so they do not appear in the generated HTML. In future, we will
+ stop these from even getting in to the XML.
+
+ 2010-04-07 Murray Cumming <murrayc murrayc com>
+
+ Really fix the @newin2p* in the *_override.xml files.
+
+ * gdk/src/gdk_docs_override.xml:
+ * gtk/src/gtk_docs_override.xml: Use GTK+'s original Since: syntax here
+ instead of @newin{2,*} because that is what our parser currently expects.
+ Otherewise it is interpreted as a parameter name.
+
+ 2010-04-07 Murray Cumming <murrayc murrayc com>
+
+ Replace some @newin2p* with @newin{2,*}.
+
+ * gdk/src/gdk_docs_override.xml:
+ * gtk/src/gtk_docs_override.xml: Replaces uses of the old @newin2p* with
+ @newin{2,*} after I noticed it in generated HTML.
+
+ 2010-04-06 Murray Cumming <murrayc murrayc com>
+
+ RecentAction: Fix the constructor that takes a RecentManager.
+
+ * gtk/src/recentaction.hg: Constructor: Rename the manager parameter to
+ recent_manager, so that gmmproc generates code that uses the correct
+ property name.
+ This fixes bug #612900 (Morten Skaaning)
+
+ 2010-04-06 Murray Cumming <murrayc murrayc com>
+
+ TreeRowReference::get_model(): Correct the reference counting.
+
+ * gtk/src/treerowreference.hg: get_model(): Add a refreturn.
+ This fixes bug #611814 (Kamil Renczewski)
+
+ 2010-04-03 Armin Burgmeier <armin arbur net>
+
+ * win32_installer/gtkmm-vc80-2_4.vsprops:
+ * win32_installer/gtkmm-vc80-d-2_4.vsprops:
+ * win32_installer/gtkmm-vc90-2_4.vsprops:
+ * win32_installer/gtkmm-vc90-d-2_4.vsprops: Remove iconv.lib which is
+ no longer required by the libxml2 binary.
+
+ * win32_installer/install-msvc-module:
+ * win32_installer/gtkmm-installer.nsi.in: Update for the 2.20
+ installer.
+
+ 2010-04-03 Armin Burgmeier <armin arbur net>
+
+ * gtk/gtkmm.h: Ifdef out inclusion of files that are no longer
+ installed on Windows.
+
+ 2010-04-03 Armin Burgmeier <armin arbur net>
+
+ * MSVC_Net2005/gtkmm/gtkmm.vcproj:
+ * MSVC_Net2008/gtkmm/gtkmm.vcproj: Add the new source files to the
+ projects.
+
+ 2.20.0:
+
+ 2010-03-23 Murray Cumming <murrayc murrayc com>
+
+ Fix small API problems found by Jonathan Jongsma.
+
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Add ToolPalette, ToolItemGroup,
+ OffscreenWindow.
+ * gtk/src/gtk_signals.defs: Add new .defs.
+
+ * gtk/src/offscreenwindow.hg: Added const versions of get_pixbuf() and
+ get_pixmap()
+ * gtk/src/range.hg: Make get_slider_range() const.
+ * gtk/src/spinner.hg:
+ * gtk/src/toolitemgroup.hg: Add @newin tags.
+ * gtk/src/toolpalette.hg: Fix a double @@ in the newin tag.
+ Remove exclusive property (it is really a child property).
+ Derive from (and implement) ToolShell.
+
+ 2010-03-22 Murray Cumming <murrayc murrayc com>
+
+ * gtk/src/toolpalette.hg: Added a const version of get_drop_item().
+
+ 2010-03-19 Murray Cumming <murrayc murrayc com>
+
+ Regenerated C documentation XML files.
+
+ * gdk/src/gdk_docs.xml:
+ * gtk/src/gtk_docs.xml: Regenerated.
+
+ 2010-03-18 Murray Cumming <murrayc murrayc com>
+
+ Demo: Fix use of deprecated API.
+
+ * configure.ac: Add PANGOMM to the list of deprecations to check for.
+ * demos/Makefile.am: Add GTKMM's own deprecation defines so we don't ever use
+ deprecated API in this code.
+ * demos/gtk-demo/example_colorsel.cc:
+ * demos/gtk-demo/example_uimanager.cc: Correct use of deprecated API.
+
+ 2.19.7:
+
+ 2010-03-17 Murray Cumming <murrayc murrayc com>
+
+ * gdk/src/screen.hg: Added get_primary_monitor().
+
+ 2010-03-17 Murray Cumming <murrayc murrayc com>
+
+ Added some methods.
+
+ * gdk/src/gdk_pixbuf.defs: Regenerated and moved to gdk_pixbuf_methods.defs.
+ * gdk/src/filelist.am:
+ * gdk/src/gdk.defs: Updated appropriately.
+ * gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
+ * gdk/src/window.hg: Added flush().
+ * gtk/src/statusbar.hg: Added get_message_area().
+ * gtk/src/toolitem.hg: Added get_ellipsize_mode().
+ * gtk/src/toolitemgroup.hg: Added get_label_widget().
+
+ 2010-03-16 Murray Cumming <murrayc murrayc com>
+
+ ToolItem, ToolShell: Wrapped new C functions.
+
+ * gtk/src/toolitem.hg: Added get_text_alignment(), get_text_orientation(),
+ get_text_size_group().
+ * gtk/src/toolshell.hg: Added get_text_orientation(), get_text_alignment(),
+ get_ellipsize_mode(), get_text_size_group()
+ * tools/m4/convert_gtk.m4: Added SizeGroup conversions.
++>>>>>>> gtkmm-2-20:ChangeLog
2010-03-16 Murray Cumming <murrayc murrayc com>
diff --cc configure.ac
index 9f938d1,c217632..00fd597
--- a/configure.ac
+++ b/configure.ac
@@@ -53,10 -53,10 +53,10 @@@ AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [
AS_IF([test "x$enable_static" = xyes],
[AC_DEFINE([GTKMM_STATIC_LIB], [1], [Define when building gtkmm as a static library])])
- AC_SUBST([ATKMM_MODULES], ['glibmm-2.4 >= 2.22 atk >= 1.12'])
+ AC_SUBST([ATKMM_MODULES], ['glibmm-2.4 >= 2.24 atk >= 1.12'])
# gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.20.0'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.22 pangomm-1.4 >= 2.26 gtk+-3.0 >= 2.90.0'])
AS_IF([test "x$gtkmm_host_windows" = xyes],
[GTKMM_MODULES=$GDKMM_MODULES],
diff --cc gdk/src/window.hg
index 1aa7c18,c65daec..2c13f6d
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@@ -135,9 -138,13 +135,10 @@@ 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 flush(), gdk_window_flush)
_WRAP_METHOD(void set_title(const Glib::ustring& title), gdk_window_set_title)
_WRAP_METHOD(void set_role(const Glib::ustring& role), gdk_window_set_role)
_WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gdk_window_set_startup_id)
diff --cc gtk/gtkmm.h
index e6bebb3,f035f92..44b1920
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@@ -110,13 -172,18 +168,17 @@@ extern const int gtkmm_micro_version
#include <gtkmm/notebook.h>
#include <gtkmm/object.h>
#include <gtkmm/offscreenwindow.h>
-#include <gtkmm/optionmenu.h>
#include <gtkmm/paned.h>
#include <gtkmm/pagesetup.h>
- #include <gtkmm/pagesetupunixdialog.h>
+ #ifndef G_OS_WIN32
+ # include <gtkmm/pagesetupunixdialog.h>
+ #endif
#include <gtkmm/papersize.h>
#include <gtkmm/printcontext.h>
- #include <gtkmm/printer.h>
- #include <gtkmm/printjob.h>
+ #ifndef G_OS_WIN32
+ # include <gtkmm/printer.h>
+ # include <gtkmm/printjob.h>
+ #endif
#include <gtkmm/printoperation.h>
#include <gtkmm/printoperationpreview.h>
#include <gtkmm/printsettings.h>
diff --cc gtk/src/toolbar.hg
index 0bdd11c,656cf9c..3fae5ed
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@@ -121,18 -123,12 +121,6 @@@ public
_IGNORE_SIGNAL("move_focus")
_IGNORE_SIGNAL("focus_home_or_end")
- //This is probably the same as Container::children().size(), which is deprecated anyway?
- //_MEMBER_GET(num_children, num_children, int, gint)
-
- //There is already set/get_orientation():
- //_MEMBER_GET(orientation, orientation, GtkOrientation, Orientation)
-
- //There is already set/get_toolbar_style():
- //_MEMBER_GET(style, style, GtkToolbarStyle, ToolbarStyle)
-
- //There is already set/get_icon_size():
- //_MEMBER_GET(icon_size, icon_size, int, gint)
-
- #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
-
//Ignore deprecated GtkToolbarAPI:
//Normally we just deprecate it in gtkmm too,
//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
diff --cc gtk/src/toolitem.hg
index 23429ae,b3262bb..e284987
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@@ -21,8 -24,8 +21,10 @@@
_CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/bin.h>
+#include <gtkmm/activatable.h>
+ #include <gtkmm/tooltips.h>
+ #include <gtkmm/sizegroup.h>
+
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
diff --cc tools/extra_defs_gen/generate_defs_gtk.cc
index d038cad,46c7729..b44f67e
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@@ -147,10 -155,16 +147,11 @@@ int main(int argc, char** argv
<< get_defs( GTK_TYPE_MISC )
<< get_defs( GTK_TYPE_NOTEBOOK )
<< get_defs( GTK_TYPE_OBJECT )
+ << get_defs( GTK_TYPE_OFFSCREEN_WINDOW )
- << get_defs( GTK_TYPE_OPTION_MENU )
<< get_defs( GTK_TYPE_ORIENTABLE )
<< get_defs( GTK_TYPE_PANED )
- << get_defs( GTK_TYPE_PIXMAP )
#if !defined(G_OS_WIN32)
<< get_defs( GTK_TYPE_PLUG )
-#endif /* G_OS_WIN32 */
- << get_defs( GTK_TYPE_PREVIEW )
-#if !defined(G_OS_WIN32)
<< get_defs( GTK_TYPE_PRINTER )
<< get_defs( GTK_TYPE_PRINT_JOB )
#endif /* G_OS_WIN32 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
