[gtkmm/gtkmm-3maybe: 5/5] Merge from master
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3maybe: 5/5] Merge from master
- Date: Thu, 25 Feb 2010 08:21:00 +0000 (UTC)
commit 34d5b5a4036c56535c95c0926b541cbfdb77b176
Merge: 4f71765 511dff3
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Feb 24 11:50:39 2010 +0100
Merge from master
ChangeLog | 2646 +++++++++++++++++++++++----------------------
NEWS | 933 ++++++++--------
configure.ac | 4 +-
gdk/src/color.ccg | 2 +-
gdk/src/colormap.ccg | 5 +-
gdk/src/cursor.ccg | 8 +-
gdk/src/event.ccg | 2 +-
gdk/src/gc.ccg | 2 +-
gdk/src/pixmap.ccg | 2 +-
gdk/src/window.ccg | 2 +-
gtk/src/actiongroup.ccg | 2 +-
gtk/src/cellview.ccg | 2 +-
gtk/src/gtk_methods.defs | 51 +
gtk/src/gtk_signals.defs | 54 +
gtk/src/iconfactory.ccg | 2 +-
gtk/src/iconinfo.ccg | 2 +-
gtk/src/iconset.ccg | 2 +-
gtk/src/menushell.ccg | 2 +-
gtk/src/paned.hg | 12 +-
gtk/src/printoperation.hg | 2 +-
gtk/src/rc.ccg | 8 +-
gtk/src/recentinfo.ccg | 2 +-
gtk/src/tooltip.ccg | 2 +-
gtk/src/tooltip.hg | 5 +
gtk/src/treeiter.ccg | 12 +-
gtk/src/widget.ccg | 7 +
gtk/src/widget.hg | 27 +-
27 files changed, 2008 insertions(+), 1792 deletions(-)
---
diff --cc ChangeLog
index 7b1fbf9,9361c90..728e1b1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -79,340 -132,16 +132,345 @@@
* gtk/src/toolpalette.hg: Fix the build with latest GTK+.
* tools/m4/convert_gtk.m4: Added necessary conversions.
+
+2010-01-05 Murray Cumming <murrayc murrayc com>
+
+ Demos: Fix the build.
+
- * demos/gtk-demo/example_treeview_treestore.cc: Correct more uses of
++ * demos/gtk-demo/example_treeview_treestore.cc: Correct more uses of
+ get_first_cell_renderer() to get_first_cell().
+
2010-01-05 Murray Cumming <murrayc murrayc com>
- Deprecate some methods that wrap deprecated C functions.
+ Remove more deprecated methods.
+
+ * gdk/src/event.hg:
+ * gdk/src/pixbuf.hg:
+ * gdk/src/window.hg:
+ * gtk/src/aboutdialog.hg:
+ * gtk/src/action.hg:
+ * gtk/src/button.hg:
+ * gtk/src/calendar.hg:
+ * gtk/src/cellrenderer.hg:
+ * gtk/src/cellview.hg:
+ * gtk/src/menuitem.hg:
+ * gtk/src/menutoolbutton.hg:
- * gtk/src/notebook.[hg|ccg]: Removed more undefs and removed deprecated
++ * gtk/src/notebook.[hg|ccg]: Removed more undefs and removed deprecated
+ methods that it showed.
+ * gtk/gtkmm.h: Don't mention the removed curve.h and inputdialog.h files.
+ * demos/gtk-demo/example_treeview_editable_cells.cc: Adapted.
+
+2010-01-05 Murray Cumming <murrayc murrayc com>
+
+ Remove more deprecated methods.
+
+ * gtk/src/filelist.am:
+ * gtk/src/curve.[hg|cc]:
+ * gtk/src/inputdialog.[hg|ccg]: Removed deprecated classes.
+ * gtk/gtkmm/border.h: Removed because this file is now generated.
+ * gtk/src/toolbar: Inherit (and implement) from CellLayout.
- * gtk/src/button.hg, fixed.hg, recentmanager.hg, scalebutton.hg,
++ * gtk/src/button.hg, fixed.hg, recentmanager.hg, scalebutton.hg,
+ toolbar.hg, treeview.hg, treeviewcolumn.hg, widget.hg:
+ Removed deprecated methods, discovered by removing undefs.
- * gtk/src/celllayout.hg: Added get_first_cell() as a replacement for
++ * gtk/src/celllayout.hg: Added get_first_cell() as a replacement for
+ TreeViewColumng::get_first_cell().
+
+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
++ 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
++ * 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
++ * 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.
++ * 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(),
++ * 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
++ * 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/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
++ * 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
++ * 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,
++ * 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/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/notebook.[hg|ccg]:
- * gtk/src/recentmanager.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
++ * 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/actiongroup.hg:
+ * gtk/src/clipboard.hg:
- * gtk/src/cellrenderercombo.hg: Put back the no_default_handler option
++ * 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:
++<<<<<<< HEAD:ChangeLog
+ * 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/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.
-
++ 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
++ * 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
++This is the gtkmm-3maybe branch, for API/ABI breaking changes, for a possible
+future gtkmm-3.0.
++=======
+ * gtk/src/widget.[hg|ccg]: Deprecate some more methods, noticed in the
+ gtkmm-3maybe branch, where there are no undefs.
++>>>>>>> master:ChangeLog
2.19.2:
diff --cc gdk/src/colormap.ccg
index a15e3fd,2427068..da8a4e7
--- a/gdk/src/colormap.ccg
+++ b/gdk/src/colormap.ccg
@@@ -26,15 -26,26 +26,12 @@@ namespace Gd
{
Colormap::Colormap(const Glib::RefPtr<Visual>& visual, bool allocate)
- : Glib::Object( G_OBJECT( gdk_colormap_new(visual->gobj(), (gboolean)allocate) ) )
+ : Glib::Object( G_OBJECT( gdk_colormap_new(Glib::unwrap(visual), (gboolean)allocate) ) )
- {}
-
-_DEPRECATE_IFDEF_START
-int Colormap::alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle<bool>& success)
-{
- return gdk_colormap_alloc_colors(gobj(), const_cast<GdkColor*>(colors.data()), ncolors, static_cast<int>(writeable), static_cast<int>(best_match), (gboolean*)(success.data()));
-}
-
-void Colormap::free_colors(Color& colors, int ncolors)
-{
- gdk_colormap_free_colors(gobj(), (colors).gobj(), ncolors);
-}
-_DEPRECATE_IFDEF_END
+{}
-
void Colormap::free_color(Color& color)
{
gdk_colormap_free_colors(gobj(), color.gobj(), 1);
}
} // namespace Gdk
--
--
diff --cc gtk/src/widget.hg
index 0ef8f16,9b1c866..f6424fe
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@@ -599,13 -651,28 +601,28 @@@ public
_WRAP_METHOD(bool is_composited() const, gtk_widget_is_composited)
-
- //TODO: Deprecate this when the other widgets can derive from Gtk::Activatable.
- _WRAP_METHOD(Glib::RefPtr<Action> get_action(), gtk_widget_get_action, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Action> get_action() const, gtk_widget_get_action, refreturn, constversion)
+ _IGNORE(gtk_widget_get_action) //deprecated
+ _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_widget_get_related_action, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_widget_get_related_action, refreturn, constversion)
_MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
- _MEMBER_GET(requisition, requisition, Requisition, GtkRequisition)
+
+ //TODO: Move this to protected when we can break API:
+ /** Retrieves the widget's requisition.
+ *
+ * This method should only be used by widget implementations in
+ * order to discover whether the widget's requisition has actually
+ * changed after some internal state change (so that they can call
+ * queue_resize() instead of queue_draw()).
+ *
+ * Normally, size_request() should be used.
+ *
+ * @result The widget's requisition.
+ *
+ * @newin2p20
+ */
+ Requisition get_requisition() const;
+ _IGNORE(gtk_widget_get_requisition)
_WRAP_SIGNAL(void show(),"show")
@@@ -870,8 -937,12 +887,8 @@@ dn
*/
_WRAP_SIGNAL(void drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time), "drag_data_received")
- //Note that the deprecated keyword has no effect on _WRAP_SIGNAL() yet.
- //It doesn't seem like a good idea to put virtual functions in #ifdefs, because that would change the size of the class instances.
- /** @deprecated This should never have been in the API. It was never meaningful.
- */
- _WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated)
+ //_WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated)
-
+
_WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed")
_WRAP_SIGNAL(void composited_changed(), "composited_changed", no_default_handler)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
