GNOME.org
 

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

commit 8468b515fccfc6e7ec59ba3f196022fdc58a4f68
Merge: fab5c63 78bb577
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 19 11:49:49 2010 +0100

    Fixed merge conflicts.

 ChangeLog                   |   59 +-
 gtk/gtkmm.h                 |    1 +
 gtk/src/action.hg           |    4 +
 gtk/src/button.hg           |    1 -
 gtk/src/filelist.am         |    1 +
 gtk/src/fontselection.ccg   |    1 +
 gtk/src/fontselection.hg    |   30 +-
 gtk/src/gtk_docs.xml        | 4654 +++++++++++++++++++++++++++++++------------
 gtk/src/gtk_methods.defs    |   74 +-
 gtk/src/notebook.hg         |    2 +
 gtk/src/offscreenwindow.ccg |   30 +
 gtk/src/offscreenwindow.hg  |   67 +
 gtk/src/printcontext.hg     |    2 +
 gtk/src/toolitemgroup.ccg   |    4 +
 gtk/src/toolitemgroup.hg    |    9 +-
 gtk/src/toolpalette.hg      |    9 +-
 gtk/src/widget.ccg          |   39 -
 gtk/src/widget.hg           |   41 +-
 gtk/src/window.hg           |   16 +-
 tools/m4/convert_gtk.m4     |    2 +
 tools/m4/convert_pango.m4   |    5 +
 21 files changed, 3728 insertions(+), 1323 deletions(-)
---
diff --cc ChangeLog
index a1e2c2b,939e137..8e49720
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,339 -1,64 +1,388 @@@
+ 2010-01-19  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Updated gtk_docs.xml to get API reference for new methods.
+ 
+ 	* gtk/src/gtk_docs.xml: Regnerated with docextract_to_xml.py.
+ 
+ 2010-01-19  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Wrapped some new GTK+ functions.
+ 
+ 	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+ 	* gtk/src/action.hg: Added get/set_always_show_image() and property.
+ 	* gtk/src/fontselection.hg: Added get_family_list(), get_face_list(), 
+ 	get_size_list(). Reimplemented get_size_entry() and get_preview_entry() 
+ 	using new functions instead of struct fields.
+ 	Added get_family() and get_face().
+ 	* tools/m4/convert_pango.m4: Added necessary FontFace and FontFamily 
+ 	conversions.
+ 	* gtk/src/printcontext.hg: Added get_hard_margins().
+ 	* gtk/src/widget.[hg|ccg]: Added has_rc_style(), wrapping the new C function, 
+ 	deprecating rc_style().
+ 	* gtk/src/window.hg: Added get_icon_name() and icon_name property.
+ 	* gtk/src/toolpalette.hg: set_drag_source(), add_drag_dest(): 
+ 	Add suitable default parameter values.
+ 
+ 2010-01-16  Murray Cumming  <murrayc murrayc com>
+ 
+ 	ToolItemGroup: Slight API improvements.
+   
+ 	* gtk/src/toolitemgroup.[hg|ccg]: Added insert() with no position parameter.
+ 	get_item_position(): Made this const.
+ 	
+ 2010-01-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Added OffscreenWindow. Added Window::get/set_mnemonics_visible().
+ 
+ 	* gtk/src/offscreenwindow.[hg|ccg]: Added this, wrapping 
+ 	GtkOffscreenWindow.
+ 	* gtk/gtkmm.h: Include offscreenwindow.h.
+ 	* gtk/src/window.hg: Added get/set_mnemonics_visible().
+ 	Added mnemonics, accept-focus, and focus-on-map properties.
+ 
+ 2010-01-14  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix build with latest GTK+.
+ 
+ 	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+ 	* 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 
 +	get_first_cell_renderer() to get_first_cell().
 +
 +2010-01-05  Murray Cumming  <murrayc murrayc com>
 +
 +	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 
 +	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>
  
 -	Deprecate some methods that wrap deprecated C functions.
 +	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, 
 +	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 
 +	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 
 +	gtk_button_clicked() and friends. Deprecate the C++ methods.
 +	* gtk/src/filelist.am:
 +	* gtk/src/inputdialog.hg: Use undef to fix the build now that this is 
 +	deprecated in GTK+. Deprecate it in gtkmm.
 +
 +2009-12-30  Murray Cumming  <murrayc murrayc com>
 +
 +	Gdk::Window::get_default_root_window(): Correct the reference counting.
 +
 +	* gdk/src/window.hg: get_default_root_window(): Use refreturn to 
 +	correct ref the result.
 +	Bug #603852 (Mikko Rasa).
 +
 +2009-12-22  Murray Cumming  <murrayc murrayc com>>
 +
 +	Added and used ToolItemGroup.
 +
 +	* gtk/src/toolitemgroup.[hg|ccg]: Added this GtkToolItemGroup wrapper.
 +	* gtk/src/toolitem.hg: Use ToolItemGroup instead of Widget. 
 +	See https://bugzilla.gnome.org/show_bug.cgi?id=567729#c37
 +
 +2009-12-21  Murray Cumming  <murrayc murrayc com>
 +
 +	ToolPalette: Added drag methods.
 +
 +	* tools/m4/convert_gtk.m4:
 +	* gtk/src/toolpalette.hg: Added get_drag_item(), get_drag_target_item(), 
 +	and get_drag_target_group().
 +
 +2009-12-17  Krzesimir Nowak  <qdlacz gmail com>
 +
 +	* gtk/gtkmm/border.h: Created separate header file for Gtk::Border.
 +	It contains a typedef and Glib::Value specialization for Gtk::Border.
 +	* gtk/gtkmm/filelist.am: Add border.h to gtkmm_files_extra_h.
 +	* gtk/src/entry.hg: Remove Gtk::Border typedef and include border.h.
 +	* gtk/src/range.hg: get_range_border() vfunc now uses Gtk::Border*
 +	instead of GtkBorder*. Written proper conversions for this.
 +	* gtk/gtkmm.h: Include the new border.h header.
 +
 +2009-12-17  Murray Cumming  <murrayc murrayc com>
 +
 +	Added ToolPalette.
 +
 +	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
 +	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
 +	* gtk/src/toolpalette.[hg|ccg]: An initial wrapper for GtkToolPalette.
 +	* gtk/gtkmm.h: Include the new toolpalette.h header.
 +
 +2009-12-16  Armin Burgmeier  <armin arbur net>
 +
 +	* win32_installer/translations/english.nsh:
 +	* win32_installer/translations/french.nsh:
 +	* win32_installer/translations/simpchinese.nsh: Added a new string
 +	recommending to choose a path not containing spaces for pkg-config to
 +	work.
 +
 +	* win32_installer/gtkmm-installer.nsi.in: Show that string on the
 +	installation directory page. Also remove libxml2 and libgail-util
 +	documentation shortcuts from start menu on uninstall, and added
 +	pangommconfig.h and fontconfig.pc to the installer.
 +
 +2009-12-11  Krzesimir Nowak  <qdlacz gmail com>
 +
 +	* gtk/src/border.[hg|ccg]: Wrapped GtkBorder.
 +	* gtk/src/entry.hg: Removed a TODO and typedef and included border.h.
 +	* gtk/src/range.[hg|ccg]: Made get_range_border vfunc use Gtk::Border&
 +	instead of GtkBorder* - this needed wrapping it partially by hand by
 +	writing custom C callback.
 +	* tools/m4/convert_gtk.m4: Added conversion macros for Gtk::Border.
 +	* gtk/gtkmm.h: Added border.h include.
 +	* MSVC_Net{2005,2008}/gtkmm/gtkmm.vcproj: Added border.h and border.cc
 +	to build.
 +
 +2009-12-10  Krzesimir Nowak  <qdlacz gmail com>
 +
 +	* gdk/src/window.hg: Remove extra colons at offscreen methods
 +	to avoid warnings.
 +
 +2009-12-03  José Alburquerque  <jaalburqu svn gnome org>
 +
 +	Make build successful when exceptions, vfuncs, etc. are disabled.
 +
 +	* gtk/src/builder.hg:
 +	* gtk/src/builder.ccg: Included definitions and code for Glib::Error
 +	methods for when exceptions are disabled.
 +	(get_type_from_name_vfunc_callback): Wrap around #ifdefs for when
 +	vfuncs are not enabled.
 +	* gtk/src/menushell.ccg:
 +	* gtk/src/menushell.hg: Removed unneeded #endif and #ifdefs.
 +	(MenuShell_Class::insert_vfunc_callback):  Wrap around #ifdefs for
 +	when vfuncs are not enabled.
  
 +2009-12-03  Murray Cumming  <murrayc murrayc com>
 +
 +	Gdk::Window: Add get/set_offscreen_embedder() and get_offscreen_pixmap().
 +
 +	* gdk/src/window.hg: Add get/set_offscreen_embedder() and 
 +	get_offscreen_pixmap(), suggested by Oscar Lazzarino.
 +
 +2009-11-27  Benjamin Herr  <ben 0x539 de>
 +
 +	Gdk::PixbufAnimationIter: Make the methods public.
 +
 +	* gdk/src/pixbufanimationiter.hg: Made get_delay_time(), get_pixbuf(),
 +	on_currently_loading_frame() and advance() public instead of
 +	protected, as is necessary to actually use them.
 +	Bug #598484.
 +
 +2009-11-27  Debarshi Ray  <debarshi ray gmail com>
 +	
 +	Added Dialog::get_widget_for_response().
 +
 +	* gtk/src/dialog.hg: Added get_widget_for_response(), wrapping 
 +	gtk_dialog_get_widget_for_response().
 +	* gtk/src/gtk_methods.defs: Added the C function definition.
 +	Bug #600411.
 +
 +2009-11-27  Debarshi Ray  <debarshi ray gmail com>
 +	
 +	Add CellRendererSpin and Spinner.
 +
 +	* gtk/src/cellrenderspin.[hg|ccg]:
 +	* gtk/src/spinner.[hg|ccg]: New files, wrapping new C API.
 +	* gtk/src/gtk_methods.defs:
 +	* gtk/src/gtk_signals.defs:
 +	* tools/extra_defs_gen/generate_defs_gtk.cc: Add new definitions of the 
 +	C API.
 +	* gtk/gtkmm.h: Include the new headers.
 +	* configure.ac: Require a newer version of GTK+.
 +	Bug #598715.
 +
 +2009-10-30  Murray Cumming  <murrayc murrayc com>
 +
 +	VPaned documentation now says that it's vertical.
 +
 +	* gtk/src/paned.hg: Correct the VPaned documentation to say that it 
 +	is vertical rather than horizontal. Fixes bug #598653 (merenyi).
 +
 +2009-10-27  Armin Burgmeier  <armin arbur net>
 +
 +	* win32_installer/gtkmm-installer.nsi.in: Add a bunch of new include
 +	files in the GTK+ bundle to the installer, as well as gail.pc.
 +
 +2009-10-27  Armin Burgmeier  <armin arbur net>
 +
 +	* MSVC_Net2005/gtkmm/gtkmm.vcproj:
 +	* MSVC_Net2008/gtkmm/gtkmm.vcproj: Added infobar.{h,cc} to the
 +	project.
 +
 +	* win32_installer/build-installer: Don't copy /bundle/contrib since
 +	this does not exist anymore in more recent GTK+ bundles.
 +
 +	* win32_installer/install-msvc-module:
 +	* win32_installer/gtkmm-installer.nsi.in: Update for GTK+ 2.18 and
 +	gtkmm 2.18.
 +
 +2009-05-05  Murray Cumming  <murrayc murrayc com>
 +
 +	* gdk/gdkmm/general.[h|cc]:
 +	* gdk/src/event.hg:
 +	* gtk/gtkmm/comboboxentrytext.[h|cc]:
 +	* gtk/gtkmm/comboboxtext.[h|cc]:
 +	* gtk/src/icontheme.hg:
 +	* gtk/src/menuitem.hg:
 +	* gtk/src/treeview.hg: Removed more deprecated methods.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	* gtk/src/filechooser.hg: Use std::string for filenames, instead of ustring, 
 +	fixing bug #142138.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	* gdk/src/*.[hg|ccg]:
 +	* gtk/src/*.[hg|ccg]: Removed most deprecated methods.
 +
 +2009-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	Removed deprecated classes.
 +	
 +	* gtk/src/combo.[hg|ccg]:
 +	* gtk/src/fileselection.[hg|ccg]:
 +	* gtk/src/optionmenu.[hg|ccg]:
 +	* gtk/src/progress.[hg|ccg]:
 +	* gtk/src/tooltips.[hg|ccg]: Removed these deprecated classes.
 +	* gtk/src/inputdialog.[hg|ccg]:
 +	* gtk/src/menutoolbutton.[hg|ccg]:	
 +	* gtk/src/eventbox.[hg|ccg]:
 +	* gtk/src/toolitem.[hg|ccg]:
 +	* gtk/src/toolbart.[hg|ccg]: Removed uses of these classes.
 +
 +2009-04-30  Murray Cumming  <murrayc murrayc com>
 +
 +	Inherit Buildable.
 +	
 +	* gtk/src/buildable.[hg|ccg]: Added this interface.
 +	* gtk/src/action.[hg|ccg]:
 +	* gtk/src/actiongroup.[hg|ccg]:
 +	* gtk/src/liststore.[hg|ccg]:
 +	* gtk/src/sizegroup.[hg|ccg]:
 +	* gtk/src/treestore.[hg|ccg]:
 +	* gtk/src/widget.[hg|ccg]: Inherit and Implement Buildable.
 +		
 +2009-04-30  Murray Cumming  <murrayc murrayc com>
 +
 +	Inherit Activatable, and some build fixes.
 +	
  	* gtk/src/button.hg:
 -	* gtk/src/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 
 +		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/widget.[hg|ccg]: Deprecate some more methods, noticed in the 
 -	gtkmm-3maybe branch, where there are no undefs.
 +	* gtk/src/scrollbar.hg:
 +	* gtk/src/separator.hg:
 +	* gtk/src/spinbutton.hg: Derive from Orientable.
 +	
 +	* gtk/src/combobox.hg: Derived from CellEditable.
 +		
 +	* gtk/src/entrycompletion.hg: 
 +	* gtk/src/iconview.hg: 
 +	* gtk/src/treeviewcolumn.hg: Derive from CellLayout.
 +
 +2009-04-24  Murray Cumming  <murrayc murrayc com>
 +
 +	Remove uses of no_default_handler.	
 +	
 +	* gdk/src/pixbufloader.hg:
 +	* gtk/src/accelgroup.hg:
 +	* gtk/src/actiongroup.hg:
 +	* gtk/src/cellrenderer.hg:
 +	* gtk/src/cellrenderercombo.hg:
 +	* gtk/src/clipboard.hg:
 +	* gtk/src/entry.hg:
 +	* gtk/src/entrycompletion.hg:
 +	* gtk/src/filechooser.hg:
 +	* gtk/src/filechooserbutton.hg:
 +	* gtk/src/menushell.hg:
 +	* gtk/src/notebook.hg:
 +	* gtk/src/range.hg:
 +	* gtk/src/recentchooser.hg:
 +	* gtk/src/spinbutton.hg:
 +	* gtk/src/statusicon.hg:
 +	* gtk/src/textbuffer.hg:
 +	* gtk/src/toolitem.hg:
 +	* gtk/src/uimanager.hg:
 +	* gtk/src/widget.hg: Remove use of the no_default_handler option with 
 +	_WRAP_SIGNAL(), breaking ABI by adding virtual methods.
 +
 +This is the gtkmm-3maybe branch, for API/ABI breaking changes, for a possible 
 +future gtkmm-3.0.
  
- =======
- =======
  2.19.2:
  
  2010-01-04  Murray Cumming  <murrayc murrayc com>
diff --cc gtk/gtkmm.h
index 7363f2b,fcad19f..e6bebb3
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@@ -109,6 -113,8 +109,7 @@@ extern const int gtkmm_micro_version
  #include <gtkmm/misc.h>
  #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>
diff --cc gtk/src/action.hg
index be4fccb,1751423..c7311cc
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@@ -224,9 -228,12 +227,10 @@@ public
    _WRAP_PROPERTY("sensitive", bool)
    _WRAP_PROPERTY("visible", bool)
    _WRAP_PROPERTY("action_group", Glib::RefPtr<ActionGroup>)
+   _WRAP_PROPERTY("always-show-image", bool)
  
  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:
    //Widget-creation routines:
diff --cc gtk/src/button.hg
index 73deafe,3958b6e..a0c697f
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@@ -74,8 -78,12 +74,7 @@@ public
     */
    explicit Button(const StockID& stock_id);
  
--
 -  _WRAP_METHOD(void pressed(), gtk_button_pressed, deprecated)
 -  _WRAP_METHOD(void released(),gtk_button_released, deprecated)
 -  _WRAP_METHOD(void clicked(), gtk_button_clicked, deprecated)
 -  _WRAP_METHOD(void enter(), gtk_button_enter, deprecated)
 -  _WRAP_METHOD(void leave(), gtk_button_leave, deprecated)
 +  _IGNORE(gtk_button_pressed, gtk_button_released, gtk_button_clicked, gtk_button_enter, gtk_button_leave) //deprecated
  
    _WRAP_METHOD(void set_relief(ReliefStyle newstyle), gtk_button_set_relief)
    _WRAP_METHOD(ReliefStyle get_relief() const, gtk_button_get_relief)
diff --cc gtk/src/filelist.am
index a76e8b5,e7c4c5f..7806f3b
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@@ -95,6 -94,8 +95,7 @@@ gtkmm_files_any_hg =		
  	misc.hg			\
  	notebook.hg		\
  	object.hg		\
+ 	offscreenwindow.hg	\
 -	optionmenu.hg		\
  	orientable.hg		\
  	pagesetup.hg		\
  	paned.hg		\
diff --cc gtk/src/notebook.hg
index eb29c25,eed6824..42a1bd1
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@@ -372,7 -388,16 +372,9 @@@ public
    _WRAP_METHOD(void set_menu_label(Widget& child, Widget& menu_label), gtk_notebook_set_menu_label)
    _WRAP_METHOD(void set_menu_label_text(Widget& child, const Glib::ustring& menu_text), gtk_notebook_set_menu_label_text)
    _WRAP_METHOD(Glib::ustring get_menu_label_text(Widget& child) const, gtk_notebook_get_menu_label_text)
+ 
 -  _DEPRECATE_IFDEF_START
 -  /** @deprecated Modify the "tab-expand" and "tab-fill" child properties instead.
 -   */
 -  void query_tab_label_packing(Widget& child, bool& expand, bool& fill, PackType& pack_type);
 -  _IGNORE(gtk_notebook_query_tab_label_packing)
 -  _DEPRECATE_IFDEF_END
 -
 -  _WRAP_METHOD(void set_tab_label_packing(Widget& child, bool expand, bool fill, PackType pack_type), gtk_notebook_set_tab_label_packing, deprecated)
 +  _IGNORE(gtk_notebook_query_tab_label_packing, gtk_notebook_set_tab_label_packing) //deprecated
+ 
    _WRAP_METHOD(void reorder_child(Widget& child, int position), gtk_notebook_reorder_child)
  
    _WRAP_METHOD(bool get_tab_reorderable(Widget& child) const, gtk_notebook_get_tab_reorderable)
diff --cc gtk/src/widget.ccg
index 74c4b4a,87db77a..0c5fcf4
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@@ -287,42 -287,51 +287,6 @@@ bool Widget::is_realized() cons
  bool Widget::is_mapped() const
    { return GTK_WIDGET_MAPPED(gobj()); }
  
--_DEPRECATE_IFDEF_START
--//deprecated:
--bool Widget::is_drawable() const
--{
--  return get_is_drawable();
--}
--
--//deprecated:
--bool Widget::receives_default() const
--{
--  return get_receives_default();
--}
--
--//deprecated:
--bool Widget::is_toplevel() const
--{
--  return get_is_toplevel();
--}
--
--//deprecated:
--bool Widget::is_visible() const
--  { return get_visible(); }
--
--//deprecated:
--bool Widget::sensitive() const
--  { return get_sensitive(); }
--
--//deprecated:
--bool Widget::app_paintable() const
--  { return get_app_paintable(); }
--
--//deprecated:
--bool Widget::double_buffered() const
--  { return get_double_buffered(); }
- _DEPRECATE_IFDEF_END
--
 -//deprecated:
 -bool Widget::rc_style() const
 -  { return has_rc_style(); }
 -
 -//deprecated:
 -bool Widget::is_composite_child() const
 -  { return GTK_WIDGET_COMPOSITE_CHILD(gobj()); }
 -
 -_DEPRECATE_IFDEF_END
 -
  Allocation Widget::get_allocation() const
  {
    Allocation allocation;
diff --cc gtk/src/widget.hg
index 00f9231,ffff948..cb74f91
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@@ -189,16 -191,16 +189,12 @@@ public
  
    _WRAP_METHOD(void set_can_focus(bool can_focus = true), gtk_widget_set_can_focus)
    _WRAP_METHOD(bool get_can_focus() const, gtk_widget_get_can_focus)
--  _WRAP_METHOD(bool can_focus() const, gtk_widget_get_can_focus,
--               deprecated "Replaced by get_can_focus().")
    _WRAP_METHOD(bool has_focus() const, gtk_widget_has_focus)
  
    _WRAP_METHOD(bool is_focus() const, gtk_widget_is_focus)
    _WRAP_METHOD(void grab_focus(), gtk_widget_grab_focus)
    _WRAP_METHOD(void set_can_default(bool can_default = true), gtk_widget_set_can_default)
    _WRAP_METHOD(bool get_can_default() const, gtk_widget_get_can_default)
--  _WRAP_METHOD(bool can_default() const, gtk_widget_get_can_default,
--               deprecated "Replaced by get_can_default().")
    _WRAP_METHOD(bool has_default() const, gtk_widget_has_default)
    _WRAP_METHOD(void grab_default(), gtk_widget_grab_default)
    _WRAP_METHOD(void set_receives_default(bool receives_default = true), gtk_widget_set_receives_default)
@@@ -590,41 -596,50 +588,8 @@@
    //: Returns property {flags.mapped}.
    bool is_mapped() const;
  
--_DEPRECATE_IFDEF_START
--  /** @deprecated: Use get_is_toplevel() instead.
--   */
--  bool is_toplevel() const;
--
--  /** @deprecated: Use get_is_drawable() instead.
--   */
--  bool is_drawable() const;
--
--  /** @deprecated: Use get_visible() instead.
--   */
--  bool is_visible() const;
--
--  /** @deprecated: Use get_sensitive() instead.
--   */
--  bool sensitive() const;
--
--  /** @deprecated: Use get_app_paintable() instead.
--   */
--  bool app_paintable() const;
--
--  /** @deprecated: Use get_receives_default() instead.
--   */
--  bool receives_default() const;
--
--  /** @deprecated: Use get_double_buffered() instead.
--   */
--  bool double_buffered() const;
--
- _DEPRECATE_IFDEF_END
- 
 -  _DEPRECATE_IFDEF_END
 -
    bool parent_sensitive() const;
  
-   bool rc_style() const;
- 
 -  /** @deprecated: Use has_rc_style() instead.
 -   */
 -  bool rc_style() const;
 -
 -  _DEPRECATE_IFDEF_START
 -  /** Returns trye if the widget is a composite child of its parent.
 -   * @deprecated Use the "composite-child" property instead.
 -   */
 -  bool is_composite_child() const;
 -  _DEPRECATE_IFDEF_END
 -
    WidgetFlags get_flags() const;
    void set_flags(WidgetFlags flags);
    void unset_flags(WidgetFlags flags);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]