[gtkmm] Removed most deprecated methods.
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Removed most deprecated methods.
- Date: Fri, 14 May 2010 12:42:14 +0000 (UTC)
commit c1498b275c48404fade17e7d3327bab08d162fdc
Author: Murray Cumming <murrayc murrayc com>
Date: Fri May 1 11:38:39 2009 +0200
Removed most deprecated methods.
ChangeLog | 5 ++++
gdk/src/color.ccg | 7 ------
gdk/src/color.hg | 7 ------
gdk/src/colormap.ccg | 14 +------------
gdk/src/colormap.hg | 7 ------
gdk/src/display.hg | 18 ----------------
gdk/src/drawable.hg | 1 -
gdk/src/image.hg | 3 +-
gdk/src/pixbuf.ccg | 44 -----------------------------------------
gdk/src/pixbuf.hg | 47 +------------------------------------------
gtk/src/aboutdialog.hg | 7 +-----
gtk/src/action.hg | 5 +---
gtk/src/calendar.hg | 3 +-
gtk/src/cellrenderer.hg | 2 +-
gtk/src/entrycompletion.hg | 3 --
gtk/src/iconinfo.ccg | 7 ------
gtk/src/iconinfo.hg | 5 ----
gtk/src/inputdialog.hg | 1 -
gtk/src/menutoolbutton.hg | 3 +-
gtk/src/messagedialog.hg | 2 +-
gtk/src/notebook.hg | 5 +---
gtk/src/pagesetup.ccg | 7 ------
gtk/src/pagesetup.hg | 15 +-------------
gtk/src/printsettings.ccg | 8 -------
gtk/src/printsettings.hg | 12 -----------
gtk/src/style.ccg | 22 --------------------
gtk/src/style.hg | 14 -------------
gtk/src/textbuffer.ccg | 17 ---------------
gtk/src/textbuffer.hg | 22 --------------------
gtk/src/textview.ccg | 17 ---------------
gtk/src/textview.hg | 14 -------------
gtk/src/toolbar.hg | 3 +-
gtk/src/toolbutton.hg | 1 +
gtk/src/toolitem.hg | 3 +-
gtk/src/treemodel.ccg | 11 ----------
gtk/src/treemodel.hg | 14 -------------
gtk/src/treemodelfilter.hg | 5 ----
gtk/src/treepath.ccg | 12 -----------
gtk/src/treepath.hg | 14 +++---------
gtk/src/treesortable.ccg | 12 -----------
gtk/src/treesortable.hg | 10 ---------
gtk/src/treeview.ccg | 13 ------------
gtk/src/treeview.hg | 18 ++--------------
gtk/src/treeviewcolumn.ccg | 12 -----------
gtk/src/treeviewcolumn.hg | 14 -------------
gtk/src/widget.hg | 11 +++++----
46 files changed, 33 insertions(+), 464 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b994fd7..75b41c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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]:
diff --git a/gdk/src/color.ccg b/gdk/src/color.ccg
index 1632291..26edc5e 100644
--- a/gdk/src/color.ccg
+++ b/gdk/src/color.ccg
@@ -145,13 +145,6 @@ bool Color::set(const Glib::ustring& value)
return gdk_color_parse(value.c_str(), gobj());
}
-_DEPRECATE_IFDEF_START
-bool Color::parse(const Glib::ustring& spec)
-{
- return set(spec);
-}
-_DEPRECATE_IFDEF_END
-
gushort Color::get_red() const
{
return gobject_->red;
diff --git a/gdk/src/color.hg b/gdk/src/color.hg
index 176dbe5..7797a21 100644
--- a/gdk/src/color.hg
+++ b/gdk/src/color.hg
@@ -90,13 +90,6 @@ public:
*/
bool set(const Glib::ustring& value);
- _DEPRECATE_IFDEF_START
- /**
- * @deprecated See set().
- */
- bool parse(const Glib::ustring& spec);
- _DEPRECATE_IFDEF_END
-
/** Get the red component of the color.
* @result The red component of the color.
*/
diff --git a/gdk/src/colormap.ccg b/gdk/src/colormap.ccg
index 2427068..a9884d4 100644
--- a/gdk/src/colormap.ccg
+++ b/gdk/src/colormap.ccg
@@ -27,19 +27,7 @@ namespace Gdk
Colormap::Colormap(const Glib::RefPtr<Visual>& visual, bool 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)
{
diff --git a/gdk/src/colormap.hg b/gdk/src/colormap.hg
index 8e9963f..952bb49 100644
--- a/gdk/src/colormap.hg
+++ b/gdk/src/colormap.hg
@@ -58,15 +58,8 @@ public:
//_WRAP_METHOD(void change(int ncolors), gdk_colormap_change)
- _DEPRECATE_IFDEF_START
- ///@deprecated Use alloc_color().
- int alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle<bool>& success);
_IGNORE(gdk_colormap_alloc_colors)
-
- ///@deprecated Use free_color()
- void free_colors(Color& colors, int ncolors);
_IGNORE(gdk_colormap_free_colors)
- _DEPRECATE_IFDEF_END
_WRAP_METHOD(bool alloc_color(Color& color, bool writeable = false, bool best_match = true), gdk_colormap_alloc_color)
void free_color(Color& color);
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index a02f5ca..9014d5d 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -140,24 +140,6 @@ public:
_WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn)
-#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);
-#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)
diff --git a/gdk/src/drawable.hg b/gdk/src/drawable.hg
index 646e799..7248ec4 100644
--- a/gdk/src/drawable.hg
+++ b/gdk/src/drawable.hg
@@ -69,7 +69,6 @@ protected:
public:
_WRAP_CREATE()
- _WRAP_METHOD(void get_size(int& width, int& height), gdk_drawable_get_size, deprecated "Use the const version of this method.")
_WRAP_METHOD(void get_size(int& width, int& height) const, gdk_drawable_get_size)
_WRAP_METHOD(int get_depth() const, gdk_drawable_get_depth)
diff --git a/gdk/src/image.hg b/gdk/src/image.hg
index 117736d..c0b9f7a 100644
--- a/gdk/src/image.hg
+++ b/gdk/src/image.hg
@@ -61,8 +61,7 @@ protected:
public:
_WRAP_CREATE(ImageType type, const Glib::RefPtr<Visual>& visual, int width, int height)
- //We ignore gdk_image_new_bitmap() because the documentation says that it is deprecated.
- _IGNORE(gdk_image_new_bitmap)
+ _IGNORE(gdk_image_new_bitmap) //deprecated
_WRAP_METHOD(void put_pixel(int x, int y, guint32 pixel), gdk_image_put_pixel)
_WRAP_METHOD(guint32 get_pixel(int x, int y) const, gdk_image_get_pixel)
diff --git a/gdk/src/pixbuf.ccg b/gdk/src/pixbuf.ccg
index 575a648..2bbefb3 100644
--- a/gdk/src/pixbuf.ccg
+++ b/gdk/src/pixbuf.ccg
@@ -52,18 +52,6 @@ static void pixbuf_destroy_data_callback(guint8* pixels, void* user_data)
namespace Gdk
{
-_DEPRECATE_IFDEF_START
-Pixbuf::Pixbuf(const Glib::RefPtr<Image>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height)
-:
- Object((GObject*) gdk_pixbuf_get_from_image(
- 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height))
-{}
-_DEPRECATE_IFDEF_END
-
Pixbuf::Pixbuf(const Glib::RefPtr<Image>& src,
const Glib::RefPtr<Colormap>& cmap,
int src_x, int src_y,
@@ -81,18 +69,6 @@ Pixbuf::Pixbuf(const Glib::RefPtr<Image>& src,
0, src->gobj(), 0, src_x, src_y, 0, 0, width, height))
{}
-_DEPRECATE_IFDEF_START
-Pixbuf::Pixbuf(const Glib::RefPtr<Drawable>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height)
-:
- Object((GObject*) gdk_pixbuf_get_from_drawable(
- 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height))
-{}
-_DEPRECATE_IFDEF_END
-
Pixbuf::Pixbuf(const Glib::RefPtr<Drawable>& src,
const Glib::RefPtr<Colormap>& cmap,
int src_x, int src_y,
@@ -110,26 +86,6 @@ Pixbuf::Pixbuf(const Glib::RefPtr<Drawable>& src,
0, src->gobj(), 0, src_x, src_y, 0, 0, width, height))
{}
-_DEPRECATE_IFDEF_START
-Glib::RefPtr<Pixbuf> Pixbuf::create(const Glib::RefPtr<Drawable>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height)
-{
- return Glib::RefPtr<Pixbuf>( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) );
-}
-
-Glib::RefPtr<Pixbuf> Pixbuf::create(const Glib::RefPtr<Image>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height)
-{
- return Glib::RefPtr<Pixbuf>( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) );
-}
-_DEPRECATE_IFDEF_END
-
Glib::RefPtr<Pixbuf> Pixbuf::create_from_data(const guint8* data, Colorspace colorspace,
bool has_alpha, int bits_per_sample,
int width, int height, int rowstride)
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 2fcf2ef..69d8aca 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -135,12 +135,6 @@ protected:
Pixbuf(const Glib::RefPtr<Drawable>& src,
int src_x, int src_y, int width, int height);
- _DEPRECATE_IFDEF_START
- /// @deprecated Use the constructor without dest_x and dest_y parameters.
- Pixbuf(const Glib::RefPtr<Drawable>& src, const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y, int dest_x, int dest_y, int width, int height);
- _DEPRECATE_IFDEF_END
-
/** Creates a pixbuf object from an image.
*
* @param src Source Image.
@@ -168,33 +162,9 @@ protected:
Pixbuf(const Glib::RefPtr<Image>& src,
int src_x, int src_y, int width, int height);
- _DEPRECATE_IFDEF_START
- /// @deprecated Use the constructors without dest_x and dest_y parameters.
- Pixbuf(const Glib::RefPtr<Image>& src, const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y, int dest_x, int dest_y, int width, int height);
- _DEPRECATE_IFDEF_END
-
public:
typedef sigc::slot<void, const guint8*> SlotDestroyData;
- // Hand-coded so the implementation in the .ccg is also only
- // built when GDKMM_DISABLE_DEPRECATED is defined.
- _DEPRECATE_IFDEF_START
- /** @deprecated Use the create() methods that don't have the unused dest_x and dest_y parameters. */
- static Glib::RefPtr<Gdk::Pixbuf> create(const Glib::RefPtr<Drawable>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height);
-
- /** @deprecated Use the create() methods that that don't have the unused dest_x and dest_y parameters. */
- static Glib::RefPtr<Gdk::Pixbuf> create(const Glib::RefPtr<Image>& src,
- const Glib::RefPtr<Colormap>& cmap,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height);
- _DEPRECATE_IFDEF_END
-
/** Creates a pixbuf object from a drawable.
*
* Transfers image data from a Drawable and converts it to an RGB(A)
@@ -602,21 +572,8 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
int width, int height,
int alpha_threshold), gdk_pixbuf_render_threshold_alpha)
- _WRAP_METHOD(void render_to_drawable(const Glib::RefPtr<Drawable>& drawable,
- const Glib::RefPtr<Gdk::GC>& gc,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height,
- RgbDither dither,
- int x_dither, int y_dither), gdk_pixbuf_render_to_drawable, deprecated "Use Gdk::Drawable::draw_pixbuf() instead.")
- _WRAP_METHOD(void render_to_drawable_alpha(const Glib::RefPtr<Drawable>& drawable,
- int src_x, int src_y,
- int dest_x, int dest_y,
- int width, int height,
- PixbufAlphaMode alpha_mode,
- int alpha_threshold,
- RgbDither dither,
- int x_dither, int y_dither), gdk_pixbuf_render_to_drawable_alpha, deprecated "Use Gdk::Drawable::draw_pixbuf() instead.")
+ //Use Gdk::Drawable::draw_pixbuf() instead of gdk_pixbuf_render_to_drawable(), gdk_pixbuf_render_to_drawable_alpha().
+ _IGNORE(gdk_pixbuf_render_to_drawable, gdk_pixbuf_render_to_drawable_alpha,)
void render_pixmap_and_mask_for_colormap(const Glib::RefPtr<Colormap>& colormap,
Glib::RefPtr<Pixmap>& pixmap_return,
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 42d0b81..8e487f5 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -53,8 +53,7 @@ class AboutDialog : public Dialog
public:
_CTOR_DEFAULT()
- _WRAP_METHOD(Glib::ustring get_name() const, gtk_about_dialog_get_name, deprecated)
- _WRAP_METHOD(void set_name(const Glib::ustring& name), gtk_about_dialog_set_name, deprecated)
+ _IGNORE( gtk_about_dialog_get_name, gtk_about_dialog_set_name) //deprecated
_WRAP_METHOD(Glib::ustring get_program_name() const, gtk_about_dialog_get_program_name)
_WRAP_METHOD(void set_program_name(const Glib::ustring& name), gtk_about_dialog_set_program_name)
@@ -115,10 +114,6 @@ public:
static void set_url_hook(const SlotActivateLink& slot);
_IGNORE(gtk_about_dialog_set_url_hook)
-//TODO: Deprecate this, because it conflicts with the property in GtkWidget, and has been removed in GTK+ 2.12.
-//If this could not have been used without an error, then remove it:
- _WRAP_PROPERTY("name", Glib::ustring)
-
_WRAP_PROPERTY("program-name", Glib::ustring)
_WRAP_PROPERTY("version", Glib::ustring)
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 37d8fb9..5d41ee5 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -236,10 +236,7 @@ public:
_WRAP_PROPERTY("always-show-image", bool)
protected:
- //For use by child actions:
- //TODO: Deprecate these when we can derive the appropriate widgets from Activatable, when we can break ABI.
- _WRAP_METHOD(void block_activate_from(Widget& proxy), gtk_action_block_activate_from)
- _WRAP_METHOD(void unblock_activate_from(Widget& proxy), gtk_action_unblock_activate_from)
+ _IGNORE(gtk_action_block_activate_from, gtk_action_unblock_activate_from) //deprecated
protected:
//Widget-creation routines:
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index c8205d0..55e37be 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -65,8 +65,7 @@ public:
_WRAP_METHOD(int unmark_day(guint day), gtk_calendar_unmark_day)
_WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
- _WRAP_METHOD(void display_options(CalendarDisplayOptions flags),
- gtk_calendar_display_options, deprecated)
+ _IGNORE(gtk_calendar_display_options) //deprecated
_WRAP_METHOD(void set_display_options(CalendarDisplayOptions flags), gtk_calendar_set_display_options)
_WRAP_METHOD(CalendarDisplayOptions get_display_options() const, gtk_calendar_get_display_options)
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 40c82e3..79d6051 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -103,7 +103,7 @@ public:
_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().")
+ _IGNORE(gtk_cell_renderer_editing_canceled)
_WRAP_METHOD(void stop_editing(bool canceled = false), gtk_cell_renderer_stop_editing)
diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
index 3b463b3..119dd30 100644
--- a/gtk/src/entrycompletion.hg
+++ b/gtk/src/entrycompletion.hg
@@ -124,8 +124,6 @@ public:
_WRAP_METHOD(void set_popup_set_width(bool popup_set_width = true), gtk_entry_completion_set_popup_set_width)
_WRAP_METHOD(bool get_popup_set_width() const, gtk_entry_completion_get_popup_set_width)
- _WRAP_METHOD(void set_popup_single_width(bool popup_single_match = true), gtk_entry_completion_set_popup_single_match, deprecated "Use set_popup_single_match() instead. This function was wrongly named.")
-
_WRAP_METHOD(void set_popup_single_match(bool popup_single_match = true), gtk_entry_completion_set_popup_single_match)
_WRAP_METHOD(bool get_popup_single_match() const, gtk_entry_completion_get_popup_single_match)
@@ -133,7 +131,6 @@ public:
_WRAP_METHOD(void set_text_column(const TreeModelColumnBase& column), gtk_entry_completion_set_text_column)
_WRAP_METHOD(void set_text_column(int column), gtk_entry_completion_set_text_column)
- _WRAP_METHOD(int get_text_column(), gtk_entry_completion_get_text_column, deprecated "Use the const version of this method.")
_WRAP_METHOD(int get_text_column() const, gtk_entry_completion_get_text_column)
/** Emitted when an action is activated.
diff --git a/gtk/src/iconinfo.ccg b/gtk/src/iconinfo.ccg
index e89352c..4f1a6f0 100644
--- a/gtk/src/iconinfo.ccg
+++ b/gtk/src/iconinfo.ccg
@@ -41,13 +41,6 @@ bool IconInfo::get_attach_points(Glib::ArrayHandle<Gdk::Point>& /* points */) co
return result;
}
-_DEPRECATE_IFDEF_START
-IconInfo::operator bool()
-{
- return gobj() != 0;
-}
-_DEPRECATE_IFDEF_END
-
IconInfo::operator bool() const
{
return gobj() != 0;
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index e2667ea..414b140 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -37,11 +37,6 @@ public:
IconInfo(const Glib::RefPtr<IconTheme>& icon_theme, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
_IGNORE(gtk_icon_info_new_for_pixbuf)
- _DEPRECATE_IFDEF_START
- ///@deprecated Use the const version.
- operator bool();
- _DEPRECATE_IFDEF_END
-
///Tests whether the IconInfo is valid.
operator bool() const;
diff --git a/gtk/src/inputdialog.hg b/gtk/src/inputdialog.hg
index 71d6a27..9b9465d 100644
--- a/gtk/src/inputdialog.hg
+++ b/gtk/src/inputdialog.hg
@@ -55,7 +55,6 @@ public:
_MEMBER_GET_PTR(axis_list,axis_list,Table*,GtkWidget*)
_MEMBER_GET_PTR(axis_box,axis_listbox,ScrolledWindow*,GtkWidget*)
- //TODO: Really remove this? _MEMBER_GET_PTR(mode_optionmenu,mode_optionmenu,OptionMenu*,GtkWidget*,deprecated)
_MEMBER_GET_PTR(close_button,close_button,Button*,GtkWidget*)
_MEMBER_GET_PTR(save_button,save_button,Button*,GtkWidget*)
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index 5cb631f..5195b41 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -73,8 +73,7 @@ public:
_WRAP_METHOD(Menu* get_menu(), gtk_menu_tool_button_get_menu)
_WRAP_METHOD(const Menu* get_menu() const, gtk_menu_tool_button_get_menu, constversion)
- //gtk_menu_tool_button_set_arrow_tooltip is deprecated
- _IGNORE(gtk_menu_tool_button_set_arrow_tooltip)
+ _IGNORE(gtk_menu_tool_button_set_arrow_tooltip) //deprecated
_WRAP_METHOD(void set_arrow_tooltip_text(const Glib::ustring& text), gtk_menu_tool_button_set_arrow_tooltip_text)
_WRAP_METHOD(void set_arrow_tooltip_markup(const Glib::ustring& markup), gtk_menu_tool_button_set_arrow_tooltip_markup)
diff --git a/gtk/src/messagedialog.hg b/gtk/src/messagedialog.hg
index 73f99ae..d8cec3e 100644
--- a/gtk/src/messagedialog.hg
+++ b/gtk/src/messagedialog.hg
@@ -58,7 +58,7 @@ public:
_WRAP_METHOD(Widget* get_image(), gtk_message_dialog_get_image)
_WRAP_METHOD(const Widget* get_image() const, gtk_message_dialog_get_image, constversion)
- _WRAP_METHOD(void set_markup(const Glib::ustring& str), gtk_message_dialog_set_markup, deprecated "Use set_message(string, true).")
+ _IGNORE(gtk_message_dialog_set_markup)
/** Sets the primary text of the message dialog.
*
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 88f043e..305c51a 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -346,8 +346,7 @@ public:
static void set_window_creation_hook(const SlotWindowCreation& slot);
_IGNORE(gtk_notebook_set_window_creation_hook)
- _WRAP_METHOD(void set_group_id(int group_id), gtk_notebook_set_group_id, deprecated)
- _WRAP_METHOD(int get_group_id() const, gtk_notebook_get_group_id, deprecated)
+ _IGNORE(gtk_notebook_set_group_id, gtk_notebook_get_group_id) //deprecated
//TODO: Use something nicer than void*/gpointer?
_WRAP_METHOD(void set_group(void* group), gtk_notebook_set_group)
@@ -357,10 +356,8 @@ public:
_WRAP_METHOD(int get_current_page() const, gtk_notebook_get_current_page)
_WRAP_METHOD(Widget* get_nth_page(int page_num), gtk_notebook_get_nth_page)
_WRAP_METHOD(const Widget* get_nth_page(int page_num) const, gtk_notebook_get_nth_page, constversion)
- _WRAP_METHOD(int get_n_pages(), gtk_notebook_get_n_pages, deprecated "Use the const method.")
_WRAP_METHOD(int get_n_pages() const, gtk_notebook_get_n_pages)
/*Widget* get_current_page();*/ /*inconsistency with set_current_page*/
- _WRAP_METHOD(int page_num(const Widget& child), gtk_notebook_page_num, deprecated "Use the const method.")
_WRAP_METHOD(int page_num(const Widget& child) const, gtk_notebook_page_num)
_WRAP_METHOD(void set_current_page(int page_num), gtk_notebook_set_current_page)
diff --git a/gtk/src/pagesetup.ccg b/gtk/src/pagesetup.ccg
index 96deb5d..7be93c7 100644
--- a/gtk/src/pagesetup.ccg
+++ b/gtk/src/pagesetup.ccg
@@ -71,13 +71,6 @@ Glib::RefPtr<PageSetup> PageSetup::create_from_file(const std::string& file_name
return result;
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-void PageSetup::save_to_key_file(Glib::KeyFile& key_file)
-{
- gtk_page_setup_to_key_file(gobj(), (key_file).gobj(), 0);
-}
-#endif //GTKMM_DISABLE_DEPRECATED
-
void PageSetup::save_to_key_file(Glib::KeyFile& key_file) const
{
gtk_page_setup_to_key_file(const_cast<GtkPageSetup*>(gobj()), (key_file).gobj(), 0);
diff --git a/gtk/src/pagesetup.hg b/gtk/src/pagesetup.hg
index 45486be..5ec7c5c 100644
--- a/gtk/src/pagesetup.hg
+++ b/gtk/src/pagesetup.hg
@@ -156,20 +156,7 @@ 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), 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
+ _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_page_setup_to_key_file)
/** This function adds the page setup from @a setup to @a key_file,
* in the group "Page Setup"
diff --git a/gtk/src/printsettings.ccg b/gtk/src/printsettings.ccg
index c9724e5..74e8abb 100644
--- a/gtk/src/printsettings.ccg
+++ b/gtk/src/printsettings.ccg
@@ -202,14 +202,6 @@ bool PrintSettings::load_from_key_file(const Glib::KeyFile& key_file, std::auto_
return retvalue;
}
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-void PrintSettings::save_to_key_file(Glib::KeyFile& key_file)
-{
- gtk_print_settings_to_key_file(gobj(), (key_file).gobj(), 0);
-}
-#endif //GTKMM_DISABLE_DEPRECATED
-
void PrintSettings::save_to_key_file(Glib::KeyFile& key_file) const
{
gtk_print_settings_to_key_file(const_cast<GtkPrintSettings*>(gobj()), (key_file).gobj(), 0);
diff --git a/gtk/src/printsettings.hg b/gtk/src/printsettings.hg
index fcdc4c9..de25545 100644
--- a/gtk/src/printsettings.hg
+++ b/gtk/src/printsettings.hg
@@ -179,18 +179,6 @@ public:
#m4 _CONVERSION(`Glib::KeyFile&', `GKeyFile*', __FR2P)
_WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_print_settings_to_key_file)
- #ifndef GTKMM_DISABLE_DEPRECATED
- /** This function adds the print settings from @a settings to @a key_file,
- * in the "Print Settings" group.
- *
- * @newin{2,12}
- * @param key_file The Glib::KeyFile to save the print settings to.
- *
- * @deprecated Use the const version.
- */
- void save_to_key_file(Glib::KeyFile& key_file);
- #endif //GTKMM_DISABLE_DEPRECATED
-
/** This function adds the print settings from @a settings to @a key_file,
* in the "Print Settings" group.
*
diff --git a/gtk/src/style.ccg b/gtk/src/style.ccg
index 690c5bc..12d89c1 100644
--- a/gtk/src/style.ccg
+++ b/gtk/src/style.ccg
@@ -148,28 +148,6 @@ Glib::RefPtr<const Gdk::GC> Style::get_base_gc(StateType state_type) const
return Glib::wrap(gobj()->base_gc[state_type], true);
}
-_DEPRECATE_IFDEF_START
-Gdk::Color Style::get_background(StateType state_type) const
-{
- GdkColor* pGdkColor = const_cast<GdkColor*>(&(gobj()->bg[state_type]));
- return Glib::wrap(pGdkColor, true); //true = take_copy.
-}
-
-Glib::RefPtr<Gdk::Pixmap> Style::get_background_pixmap(StateType state_type)
-{
- return Glib::wrap((GdkPixmapObject*) (gobj()->bg_pixmap[state_type]), true); //true = take_copy.
-}
-
-void Style::set_bg_pixmap(StateType state_type, const Glib::RefPtr<Gdk::Pixmap>& pixmap)
-{
- GdkPixmap *const old_pixmap = gobj()->bg_pixmap[state_type];
- gobj()->bg_pixmap[state_type] = Glib::unwrap_copy(pixmap);
-
- if(old_pixmap)
- g_object_unref(old_pixmap);
-}
-_DEPRECATE_IFDEF_END
-
void Style::set_bg_pixmap(StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap)
{
GdkPixmap *const old_pixmap = gobj()->bg_pixmap[state_type];
diff --git a/gtk/src/style.hg b/gtk/src/style.hg
index 5cc0074..4fb849f 100644
--- a/gtk/src/style.hg
+++ b/gtk/src/style.hg
@@ -128,20 +128,6 @@ public:
_MEMBER_GET_GOBJECT(black_gc, black_gc, Gdk::GC, GdkGC*)
_MEMBER_GET_GOBJECT(white_gc, white_gc, Gdk::GC, GdkGC*)
- _DEPRECATE_IFDEF_START
- /* @deprecated use get_bg() instead.
- */
- Gdk::Color get_background(Gtk::StateType state_type) const;
-
- /* deprecated use get_bg() instead.
- */
- Glib::RefPtr<Gdk::Pixmap> get_background_pixmap(Gtk::StateType state_type);
-
- /** @deprecated Use set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap)
- */
- void set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<Gdk::Pixmap>& pixmap);
- _DEPRECATE_IFDEF_END
-
void set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap);
Glib::RefPtr<Gdk::Pixmap> get_bg_pixmap(Gtk::StateType state_type);
diff --git a/gtk/src/textbuffer.ccg b/gtk/src/textbuffer.ccg
index e0b0f88..5546d56 100644
--- a/gtk/src/textbuffer.ccg
+++ b/gtk/src/textbuffer.ccg
@@ -183,18 +183,6 @@ void TextBuffer::set_text(const char* text_begin, const char* text_end)
gtk_text_buffer_set_text(gobj(), text_begin, text_end - text_begin);
}
-_DEPRECATE_IFDEF_START
-void TextBuffer::assign(const Glib::ustring& text)
-{
- gtk_text_buffer_set_text(gobj(), text.data(), text.bytes());
-}
-
-void TextBuffer::assign(const char* text_begin, const char* text_end)
-{
- gtk_text_buffer_set_text(gobj(), text_begin, text_end - text_begin);
-}
-_DEPRECATE_IFDEF_END
-
TextBuffer::iterator TextBuffer::insert(const iterator& pos, const Glib::ustring& text)
{
// gtk_text_buffer_insert() modifies the iterator, but that's not the
@@ -531,11 +519,6 @@ static listStrings util_convert_atoms_to_strings(GdkAtom* targets, int n_targets
return listTargets;
}
-Glib::ustring TextBuffer::get_text(bool include_hidden_chars)
-{
- return get_text(begin(), end(), include_hidden_chars);
-}
-
Glib::ustring TextBuffer::get_text(bool include_hidden_chars) const
{
TextBuffer* unconst = const_cast<TextBuffer*>(this); //Because begin() and end() are not const.
diff --git a/gtk/src/textbuffer.hg b/gtk/src/textbuffer.hg
index b596ea7..e994c42 100644
--- a/gtk/src/textbuffer.hg
+++ b/gtk/src/textbuffer.hg
@@ -115,16 +115,6 @@ public:
void set_text(const char* text_begin, const char* text_end);
_IGNORE(gtk_text_buffer_set_text)
- _DEPRECATE_IFDEF_START
- /** @deprecated Use set_text()
- */
- void assign(const Glib::ustring& text);
-
- /** @deprecated Use set_text()
- */
- void assign(const char* text_begin, const char* text_end);
- _DEPRECATE_IFDEF_END
-
//TODO: Make all insert() methods have the same return type:
/** Inserts @a text at position @a pos.
@@ -344,16 +334,8 @@ public:
iterator backspace(const iterator& iter, bool interactive = true, bool default_editable = true);
_IGNORE(gtk_text_buffer_backspace)
- /** @deprecated Use get_text(const iterator& start, const iterator& end, bool include_hidden_chars) const
- */
- _WRAP_METHOD(Glib::ustring get_text(const iterator& start, const iterator& end, bool include_hidden_chars = true), gtk_text_buffer_get_text)
-
_WRAP_METHOD(Glib::ustring get_text(const iterator& start, const iterator& end, bool include_hidden_chars = true) const, gtk_text_buffer_get_text)
- /** @deprecated Use get_text(bool include_hidden_chars) const.
- */
- Glib::ustring get_text(bool include_hidden_chars = true);
-
/** Returns all the text in the buffer. Excludes undisplayed
* text (text marked with tags that set the invisibility attribute) if
* @a include_hidden_chars is <tt>false</tt>. Does not include characters
@@ -367,10 +349,6 @@ public:
*/
Glib::ustring get_text(bool include_hidden_chars = true) const;
- /** @deprecated Use get_slice(const iterator& start, const iterator& end, bool include_hidden_chars) const.
- */
- _WRAP_METHOD(Glib::ustring get_slice(const iterator& start, const iterator& end, bool include_hidden_chars = true), gtk_text_buffer_get_slice)
-
_WRAP_METHOD(Glib::ustring get_slice(const iterator& start, const iterator& end, bool include_hidden_chars = true) const, gtk_text_buffer_get_slice)
iterator insert_pixbuf(const iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
diff --git a/gtk/src/textview.ccg b/gtk/src/textview.ccg
index c9a9af9..0c7083c 100644
--- a/gtk/src/textview.ccg
+++ b/gtk/src/textview.ccg
@@ -52,22 +52,5 @@ void TextView::scroll_to(const Glib::RefPtr<TextBuffer::Mark>& mark, double with
gtk_text_view_scroll_to_mark(gobj(), Glib::unwrap(mark), within_margin, TRUE /* use_align */, xalign, yalign);
}
-_DEPRECATE_IFDEF_START
-bool TextView::scroll_to_iter(TextBuffer::iterator& iter, double within_margin)
-{
- return scroll_to(iter, within_margin);
-}
-
-void TextView::scroll_to_mark(const Glib::RefPtr<TextBuffer::Mark>& mark, double within_margin)
-{
- scroll_to(mark, within_margin);
-}
-
-void TextView::scroll_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark)
-{
- scroll_to(mark);
-}
-_DEPRECATE_IFDEF_END
-
} // namespace Gtk
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index c9d67ad..d57cf59 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -62,20 +62,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<TextBuffer> get_buffer(), gtk_text_view_get_buffer, refreturn)
_WRAP_METHOD(Glib::RefPtr<const TextBuffer> get_buffer() const, gtk_text_view_get_buffer, refreturn, constversion)
- _DEPRECATE_IFDEF_START
- /** @deprecated Use scroll_to().
- */
- bool scroll_to_iter(TextBuffer::iterator& iter, double within_margin);
-
- /** @deprecated Use scroll_to().
- */
- void scroll_to_mark(const Glib::RefPtr<TextBuffer::Mark>& mark, double within_margin);
-
- /** @deprecated Use scroll_to()
- */
- void scroll_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark);
- _DEPRECATE_IFDEF_END
-
/** Scrolls the TextView so that @a iter is on the screen, by scrolling the minimal distance to get the mark onscreen,
* possibly not scrolling at all. The effective screen for purposes of this function is reduced by a margin of size
* @a within_margin.
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index d9f7165..61c5114 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -75,8 +75,7 @@ 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)
diff --git a/gtk/src/toolbutton.hg b/gtk/src/toolbutton.hg
index d6bf693..43ab7b3 100644
--- a/gtk/src/toolbutton.hg
+++ b/gtk/src/toolbutton.hg
@@ -77,6 +77,7 @@ public:
_WRAP_METHOD(Widget* get_label_widget(), gtk_tool_button_get_label_widget)
_WRAP_METHOD(const Widget* get_label_widget() const, gtk_tool_button_get_label_widget, constversion)
+ //TODO: We use this in toolbar.ccg. Check if it should really be deprecated.
/** This signal is emitted when the tool button is clicked with the mouse
* or activated with the keyboard.
* @deprecated This is an "action" key-binding signal that you should rarely need to use.
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 8ee9d74..e884b99 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -50,8 +50,7 @@ public:
_WRAP_METHOD(void set_expand(bool expand = true), gtk_tool_item_set_expand)
_WRAP_METHOD(bool get_expand() const, gtk_tool_item_get_expand)
- //gtk_tool_item_set_tooltip() is deprecated.
- _IGNORE(gtk_tool_item_set_tooltip)
+ _IGNORE(gtk_tool_item_set_tooltip) //deprecated.
_WRAP_METHOD(void set_tooltip_text(const Glib::ustring& text), gtk_tool_item_set_tooltip_text)
_WRAP_METHOD(void set_tooltip_markup(const Glib::ustring& markup), gtk_tool_item_set_tooltip_markup)
diff --git a/gtk/src/treemodel.ccg b/gtk/src/treemodel.ccg
index db4c7f8..3429092 100644
--- a/gtk/src/treemodel.ccg
+++ b/gtk/src/treemodel.ccg
@@ -154,17 +154,6 @@ void TreeModel::foreach(const SlotForeachPathAndIter& slot)
gtk_tree_model_foreach(gobj(), &proxy_foreach_path_and_iter_callback, &slot_copy);
}
-bool TreeModel::iter_is_valid(const iterator& iter) const
-{
- //This method is overriden in TreeStore and ListStore.
- //This implementation will only be used as a default for custom derived TreeModels,
- //and when we wrap a C GtkTreeModel with a Gtk::TreeModel instance, without knowing what derived C type it is.
-
- // This check is almost the same as the private VALID_ITER() macro in gtkliststore.c and
- // gtktreestore.c.
- return (!iter.is_end_ && iter.gobj()->stamp != 0);
-}
-
#ifdef GLIBMM_VFUNCS_ENABLED
// Custom vfunc callbacks, because the C++ vfuncs have different parameters and return types
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 90d0267..134888d 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -393,20 +393,6 @@ dnl
*/
_WRAP_VFUNC(void get_value(const iterator& iter, int column, Glib::ValueBase& value) const, get_value)
- /** Override and implement this in a derived TreeModel class.
- * @note This virtual method is not recommended. To check
- * whether an iterator is valid, call TreeStore::iter_is_valid(),
- * ListStore::iter_is_valid() or TreeModelSort::iter_is_valid() directly
- * instead. Because these methods are intended to be used only for debugging
- * and/or testing purposes, it doesn't make sense to provide an abstract
- * interface to them.
- *
- * @result true if the iterator is valid.
- *
- * @deprecated Use iter_is_valid() in the derived class.
- */
- virtual bool iter_is_valid(const iterator& iter) const;
-
//Called by TreeRow, which is a friend class:
//The comment about set_row_changed() in the documentation is based on my reading of the source of
//gtk_list_store_set_value() and gtk_tree_store_set_value().
diff --git a/gtk/src/treemodelfilter.hg b/gtk/src/treemodelfilter.hg
index 7f90d09..f32855a 100644
--- a/gtk/src/treemodelfilter.hg
+++ b/gtk/src/treemodelfilter.hg
@@ -116,11 +116,6 @@ public:
*/
iterator convert_iter_to_child_iter(const iterator& filter_iter) const;
- //TODO: Remove these deprecated non-const versions when we can break ABI:
- _WRAP_METHOD(Path convert_child_path_to_path(const Path& child_path), gtk_tree_model_filter_convert_child_path_to_path, deprecated "Use convert_child_path_to_path(const Path& child_path) const")
-
- _WRAP_METHOD(Path convert_path_to_child_path(const Path& filter_path), gtk_tree_model_filter_convert_path_to_child_path, deprecated "convert_path_to_child_path(const Path& filter_path) const")
-
_WRAP_METHOD(Path convert_child_path_to_path(const Path& child_path) const, gtk_tree_model_filter_convert_child_path_to_path)
_WRAP_METHOD(Path convert_path_to_child_path(const Path& filter_path) const, gtk_tree_model_filter_convert_path_to_child_path)
diff --git a/gtk/src/treepath.ccg b/gtk/src/treepath.ccg
index 4d84321..25d6bba 100644
--- a/gtk/src/treepath.ccg
+++ b/gtk/src/treepath.ccg
@@ -138,18 +138,6 @@ bool TreePath::set_in_selection_data(SelectionData& selection_data, const Glib::
{
return gtk_tree_set_row_drag_data(selection_data.gobj(), const_cast<GtkTreeModel*>(model->gobj()), const_cast<GtkTreePath*>(gobj()));
}
-
-_DEPRECATE_IFDEF_START
-Glib::ArrayHandle<int> TreePath::get_indices() const
-{
- // gtk_tree_path_get_indices() returns a pointer to an internal array,
- // similar to std::string::data(). Thus the OWNERSHIP_NONE flag.
-
- return Glib::ArrayHandle<int>(gtk_tree_path_get_indices(gobject_),
- gtk_tree_path_get_depth(gobject_),
- Glib::OWNERSHIP_NONE);
-}
-_DEPRECATE_IFDEF_END
} // namespace Gtk
diff --git a/gtk/src/treepath.hg b/gtk/src/treepath.hg
index 8bf6154..d3d9f51 100644
--- a/gtk/src/treepath.hg
+++ b/gtk/src/treepath.hg
@@ -132,16 +132,10 @@ public:
#m4end
- _WRAP_METHOD(void append_index(int index), gtk_tree_path_append_index, deprecated "replaced by push_back()")
- _WRAP_METHOD(void prepend_index(int index), gtk_tree_path_prepend_index, deprecated "replaced by push_front().")
- _WRAP_METHOD(int get_depth() const, gtk_tree_path_get_depth, deprecated "replaced by size().")
-
-_DEPRECATE_IFDEF_START
- /// @deprecated replaced by begin(), end(), and operator[]
- Glib::ArrayHandle<int> get_indices() const;
-_DEPRECATE_IFDEF_END
- _IGNORE(gtk_tree_path_get_depth)
-
+ _IGNORE(gtk_tree_path_append_index) //replaced by push_back()
+ _IGNORE(gtk_tree_path_prepend_index) //replaced by push_front()
+ _IGNORE(gtk_tree_path_get_depth) //replaced by size()
+
/**
* Obtains a Gtk::TreeModel and Gtk::TreeModel::Path from selection data of target type
* "GTK_TREE_MODEL_ROW". Normally called from a drag_data_received handler.
diff --git a/gtk/src/treesortable.ccg b/gtk/src/treesortable.ccg
index c24f2fa..8b1d6e4 100644
--- a/gtk/src/treesortable.ccg
+++ b/gtk/src/treesortable.ccg
@@ -78,17 +78,5 @@ void TreeSortable::unset_default_sort_func()
gobj(), 0, 0, 0); /* See GTK+ docs about the 0s. */
}
-_DEPRECATE_IFDEF_START
-void TreeSortable::set_sort_column_id(const TreeModelColumnBase& sort_column, SortType order)
-{
- set_sort_column(sort_column, order);
-}
-
-void TreeSortable::set_sort_column_id(int sort_column_id, SortType order)
-{
- set_sort_column(sort_column_id, order);
-}
-_DEPRECATE_IFDEF_END
-
} // namespace Gtk
diff --git a/gtk/src/treesortable.hg b/gtk/src/treesortable.hg
index 26ecd37..3a2f8d3 100644
--- a/gtk/src/treesortable.hg
+++ b/gtk/src/treesortable.hg
@@ -61,16 +61,6 @@ public:
_WRAP_METHOD(void set_sort_column(int sort_column_id, SortType order),
gtk_tree_sortable_set_sort_column_id)
- _DEPRECATE_IFDEF_START
- /** @deprecated Use set_sort_column() instead.
- */
- void set_sort_column_id(const TreeModelColumnBase& sort_column_id, SortType order);
-
- /** @deprecated Use set_sort_column() instead.
- */
- void set_sort_column_id(int sort_column_id, SortType order);
- _DEPRECATE_IFDEF_END
-
/** This callback should return -1 if a compares before b, 0 if they compare equal, 1 if a compares after b.
* For instance, int on_sort_compare(const Gtk::TreeModel::iterator& a, const Gtk::TreeModel::iterator& b);
*/
diff --git a/gtk/src/treeview.ccg b/gtk/src/treeview.ccg
index 4411ce4..97910cf 100644
--- a/gtk/src/treeview.ccg
+++ b/gtk/src/treeview.ccg
@@ -200,19 +200,6 @@ void TreeView::enable_model_drag_dest(Gdk::DragAction actions)
enable_model_drag_dest(listTargets, actions);
}
-_DEPRECATE_IFDEF_START
-bool TreeView::get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y)
-{
- GtkTreePath* pTreePath = 0;
- GtkTreeViewColumn* pTreeViewColumn = 0;
- const bool result = gtk_tree_view_get_path_at_pos(gobj(), x, y, &pTreePath, &pTreeViewColumn, &cell_x, &cell_y);
-
- path = TreeModel::Path(pTreePath, false /* don't take a copy, because the gtk_tree_view_get_path_at_pos() docs say that we must free the path */ );
- column = Glib::wrap(pTreeViewColumn);
- return result;
-}
-_DEPRECATE_IFDEF_END
-
bool TreeView::get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y) const
{
GtkTreePath* pTreePath = 0;
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 0229dca..3b5d1fe 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -495,12 +495,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_bin_window(), gtk_tree_view_get_bin_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_bin_window() const, gtk_tree_view_get_bin_window, refreturn, constversion)
- _DEPRECATE_IFDEF_START
- /** @deprecated Use the const version.
- */
- bool get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y);
- _DEPRECATE_IFDEF_END
-
/** Finds the path at the point (@a x, @a y), relative to bin_window coordinates
* (please get_bin_window()).
* That is, @a x and @a y are relative to an events coordinates. @a x and @a y must
@@ -553,23 +547,17 @@ public:
*/
bool get_path_at_pos(int x, int y, TreeModel::Path& path) const;
- _WRAP_METHOD(void get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect), gtk_tree_view_get_cell_area, deprecated "Use the const version")
-//We ignore the fact that one of the arguments can be 0 - it does not seem useful.
-
+ //We ignore the fact that one of the arguments can be 0 - it does not seem useful.
_WRAP_METHOD(void get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const, gtk_tree_view_get_cell_area)
- _WRAP_METHOD(void get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect), gtk_tree_view_get_background_area, deprecated "Use the const version.")
_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), 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 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), 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)
+ _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords)
bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
_IGNORE(gtk_tree_view_get_visible_range)
diff --git a/gtk/src/treeviewcolumn.ccg b/gtk/src/treeviewcolumn.ccg
index 9b6a0b9..7e6dcb7 100644
--- a/gtk/src/treeviewcolumn.ccg
+++ b/gtk/src/treeviewcolumn.ccg
@@ -104,17 +104,5 @@ const CellRenderer* TreeViewColumn::get_first_cell_renderer() const
return const_cast<TreeViewColumn*>(this)->get_first_cell_renderer();
}
-_DEPRECATE_IFDEF_START
-void TreeViewColumn::set_sort_column_id(const TreeModelColumnBase& sort_column)
-{
- set_sort_column(sort_column);
-}
-
-void TreeViewColumn::set_sort_column_id(int sort_column_id)
-{
- set_sort_column(sort_column_id);
-}
-_DEPRECATE_IFDEF_END
-
} // namespace Gtk
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index 51ed442..af138fa 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -200,16 +200,6 @@ public:
_WRAP_METHOD(void set_sort_column(const TreeModelColumnBase& sort_column_id), gtk_tree_view_column_set_sort_column_id)
_WRAP_METHOD(void set_sort_column(int sort_column_id), gtk_tree_view_column_set_sort_column_id)
- _DEPRECATE_IFDEF_START
- /** @deprecated Use set_sort_column() instead.
- */
- void set_sort_column_id(const TreeModelColumnBase& sort_column_id);
-
- /** @deprecated Use set_sort_column() instead.
- */
- void set_sort_column_id(int sort_column_id);
- _DEPRECATE_IFDEF_END
-
_WRAP_METHOD(int get_sort_column_id() const, gtk_tree_view_column_get_sort_column_id)
_WRAP_METHOD(void set_sort_indicator(bool setting), gtk_tree_view_column_set_sort_indicator)
_WRAP_METHOD(bool get_sort_indicator() const, gtk_tree_view_column_get_sort_indicator)
@@ -219,10 +209,6 @@ public:
_WRAP_METHOD(void cell_set_cell_data(const Glib::RefPtr<TreeModel>& tree_model, const TreeModel::iterator& iter, bool is_expander, bool is_expanded), gtk_tree_view_column_cell_set_cell_data)
- //This is obviously a bad cast, but we need it to preserve this (wrong) deprecated version of this function:
- #m4 _CONVERSION(`Gdk::Rectangle&',`const GdkRectangle*',const_cast<const GdkRectangle*>(($3).gobj()))
- _WRAP_METHOD(void cell_get_size(Gdk::Rectangle& cell_area, int& x_offset, int& y_offset, int& width, int& height) const, gtk_tree_view_column_cell_get_size, deprecated "Use the cell_get_size() method override that takes a const cell_area.")
-
//TODO: cell_area can be NULL. Add a method override.
//But see http://bugzilla.gnome.org/show_bug.cgi?id=542329 about the lack of C documentation.
_WRAP_METHOD(void cell_get_size(const Gdk::Rectangle& cell_area, int& x_offset, int& y_offset, int& width, int& height) const, gtk_tree_view_column_cell_get_size)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index d15ca96..7dc596c 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -161,8 +161,6 @@ public:
Requisition size_request() const;
_IGNORE(gtk_widget_size_request)
- _WRAP_METHOD(void size_request(const Requisition& requisition), gtk_widget_size_request, deprecated "Use size_request() const.")
-
_WRAP_METHOD(void size_allocate(const Allocation& allocation), gtk_widget_size_allocate)
@@ -497,7 +495,6 @@ public:
/* Directionality of Text */
_WRAP_METHOD(void set_direction(TextDirection dir), gtk_widget_set_direction)
- _WRAP_METHOD(TextDirection get_direction(), gtk_widget_get_direction, deprecated "Use the const version of this method.")
_WRAP_METHOD(TextDirection get_direction() const, gtk_widget_get_direction)
_WRAP_METHOD(static void set_default_direction(TextDirection dir), gtk_widget_set_default_direction)
@@ -524,8 +521,7 @@ public:
_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, 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_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)
@@ -969,12 +965,17 @@ dnl
*/
_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")
+<<<<<<< HEAD
//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)
+
+>>>>>>> Removed most deprecated methods.
_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]
