[gtkmm] Gtk: Remove more API which has been removed in gtk+-4
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Gtk: Remove more API which has been removed in gtk+-4
- Date: Thu, 3 Nov 2016 14:07:57 +0000 (UTC)
commit a53eea323ab9f9b3d228d72c6c13998b73f58ab3
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Thu Nov 3 15:05:07 2016 +0100
Gtk: Remove more API which has been removed in gtk+-4
After this commit, it's possible to build gtkmm against gtk+-4
from 2016-10-28. 'make check' remains to be fixed. Bug #773642.
.gitignore | 62 --------
gtk/gtkmm.h | 34 +----
gtk/gtkmm/filelist.am | 8 +-
gtk/gtkmm/radiobuttongroup.cc | 11 --
gtk/gtkmm/radiobuttongroup.h | 6 -
gtk/src/adjustment.hg | 5 -
gtk/src/application.hg | 5 -
gtk/src/assistant.hg | 7 -
gtk/src/bin.ccg | 39 -----
gtk/src/bin.hg | 47 ------
gtk/src/box.ccg | 8 +-
gtk/src/box.hg | 17 +--
gtk/src/button.ccg | 39 -----
gtk/src/button.hg | 116 +--------------
gtk/src/buttonbox.hg | 5 -
gtk/src/cellrenderer.hg | 1 -
gtk/src/cellrendererpixbuf.hg | 4 +-
gtk/src/cellrenderertext.hg | 2 -
gtk/src/cellrenderertoggle.hg | 2 -
gtk/src/cellview.hg | 3 -
gtk/src/checkmenuitem.ccg | 1 -
gtk/src/colorbutton.ccg | 32 ----
gtk/src/colorbutton.hg | 75 +---------
gtk/src/combobox.ccg | 14 --
gtk/src/combobox.hg | 35 -----
gtk/src/container.hg | 42 ------
gtk/src/cssprovider.ccg | 9 +-
gtk/src/cssprovider.hg | 10 +-
gtk/src/dialog.ccg | 9 -
gtk/src/dialog.hg | 27 ----
gtk/src/entry.hg | 14 +--
gtk/src/enums.ccg | 53 -------
gtk/src/enums.hg | 74 ----------
gtk/src/eventbox.hg | 4 +-
gtk/src/expander.hg | 5 -
gtk/src/filechooserbutton.ccg | 14 --
gtk/src/filechooserbutton.hg | 34 +----
gtk/src/filechooserwidget.hg | 8 +-
gtk/src/filelist.am | 35 +----
gtk/src/iconinfo.ccg | 24 ---
gtk/src/iconinfo.hg | 42 +-----
gtk/src/icontheme.hg | 1 -
gtk/src/image.ccg | 44 ------
gtk/src/image.hg | 48 +------
gtk/src/infobar.hg | 7 +-
gtk/src/label.ccg | 10 --
gtk/src/label.hg | 27 +---
gtk/src/layout.hg | 3 -
gtk/src/main.ccg | 216 ---------------------------
gtk/src/main.hg | 46 ------
gtk/src/menu.ccg | 9 -
gtk/src/menu.hg | 12 --
gtk/src/menuitem.ccg | 2 +-
gtk/src/menuitem.hg | 15 +--
gtk/src/menutoolbutton.ccg | 10 --
gtk/src/menutoolbutton.hg | 14 --
gtk/src/messagedialog.hg | 5 -
gtk/src/notebook.hg | 3 -
gtk/src/paned.ccg | 18 ---
gtk/src/paned.hg | 7 -
gtk/src/placessidebar.hg | 10 --
gtk/src/popover.hg | 4 -
gtk/src/radiomenuitem.ccg | 1 -
gtk/src/radiotoolbutton.ccg | 23 ---
gtk/src/radiotoolbutton.hg | 18 +--
gtk/src/range.hg | 3 -
gtk/src/recentchoosermenu.hg | 5 +-
gtk/src/recentchooserwidget.hg | 6 +-
gtk/src/scale.hg | 7 -
gtk/src/scrollbar.hg | 7 -
gtk/src/scrolledwindow.hg | 2 -
gtk/src/separator.hg | 7 -
gtk/src/settings.hg | 43 ------
gtk/src/sizegroup.hg | 7 -
gtk/src/statusbar.hg | 9 +-
gtk/src/stylecontext.ccg | 25 ++--
gtk/src/stylecontext.hg | 49 +------
gtk/src/switch.hg | 9 +-
gtk/src/textiter.ccg | 8 -
gtk/src/textiter.hg | 35 -----
gtk/src/texttag.hg | 3 -
gtk/src/textview.hg | 2 -
gtk/src/togglebutton.ccg | 7 -
gtk/src/togglebutton.hg | 9 -
gtk/src/toggletoolbutton.ccg | 10 --
gtk/src/toggletoolbutton.hg | 14 --
gtk/src/toolbar.hg | 1 -
gtk/src/toolbutton.ccg | 9 -
gtk/src/toolbutton.hg | 17 --
gtk/src/toolitem.hg | 7 +-
gtk/src/toolpalette.hg | 4 -
gtk/src/toolshell.hg | 2 -
gtk/src/tooltip.hg | 3 +-
gtk/src/treeview.hg | 13 +--
gtk/src/viewport.hg | 4 -
gtk/src/widget.ccg | 228 +----------------------------
gtk/src/widget.hg | 173 +---------------------
gtk/src/widgetpath.hg | 9 -
gtk/src/window.ccg | 13 --
gtk/src/window.hg | 52 -------
tools/extra_defs_gen/generate_defs_gtk.cc | 34 -----
tools/m4/convert_gtk.m4 | 47 ------
102 files changed, 100 insertions(+), 2318 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a336338..746bc14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,20 +110,12 @@ gtk/gtkmm/accelgroup.cc
gtk/gtkmm/accelgroup.h
gtk/gtkmm/accellabel.cc
gtk/gtkmm/accellabel.h
-gtk/gtkmm/action.cc
-gtk/gtkmm/action.h
gtk/gtkmm/actionable.cc
gtk/gtkmm/actionable.h
gtk/gtkmm/actionbar.cc
gtk/gtkmm/actionbar.h
-gtk/gtkmm/actiongroup.cc
-gtk/gtkmm/actiongroup.h
-gtk/gtkmm/activatable.cc
-gtk/gtkmm/activatable.h
gtk/gtkmm/adjustment.cc
gtk/gtkmm/adjustment.h
-gtk/gtkmm/alignment.cc
-gtk/gtkmm/alignment.h
gtk/gtkmm/appchooser.cc
gtk/gtkmm/appchooser.h
gtk/gtkmm/appchooserbutton.cc
@@ -136,8 +128,6 @@ gtk/gtkmm/application.cc
gtk/gtkmm/application.h
gtk/gtkmm/applicationwindow.cc
gtk/gtkmm/applicationwindow.h
-gtk/gtkmm/arrow.cc
-gtk/gtkmm/arrow.h
gtk/gtkmm/aspectframe.cc
gtk/gtkmm/aspectframe.h
gtk/gtkmm/assistant.cc
@@ -200,8 +190,6 @@ gtk/gtkmm/colorchooser.cc
gtk/gtkmm/colorchooser.h
gtk/gtkmm/colorchooserdialog.cc
gtk/gtkmm/colorchooserdialog.h
-gtk/gtkmm/colorselection.cc
-gtk/gtkmm/colorselection.h
gtk/gtkmm/combobox.cc
gtk/gtkmm/combobox.h
gtk/gtkmm/comboboxtext.cc
@@ -256,8 +244,6 @@ gtk/gtkmm/fontchooserdialog.cc
gtk/gtkmm/fontchooserdialog.h
gtk/gtkmm/fontchooserwidget.cc
gtk/gtkmm/fontchooserwidget.h
-gtk/gtkmm/fontselection.cc
-gtk/gtkmm/fontselection.h
gtk/gtkmm/frame.cc
gtk/gtkmm/frame.h
gtk/gtkmm/gesture.cc
@@ -282,38 +268,16 @@ gtk/gtkmm/glarea.cc
gtk/gtkmm/glarea.h
gtk/gtkmm/grid.cc
gtk/gtkmm/grid.h
-gtk/gtkmm/handlebox.cc
-gtk/gtkmm/handlebox.h
gtk/gtkmm/headerbar.cc
gtk/gtkmm/headerbar.h
-gtk/gtkmm/hvbox.cc
-gtk/gtkmm/hvbox.h
-gtk/gtkmm/hvbuttonbox.cc
-gtk/gtkmm/hvbuttonbox.h
-gtk/gtkmm/hvpaned.cc
-gtk/gtkmm/hvpaned.h
-gtk/gtkmm/hvscale.cc
-gtk/gtkmm/hvscale.h
-gtk/gtkmm/hvscrollbar.cc
-gtk/gtkmm/hvscrollbar.h
-gtk/gtkmm/hvseparator.cc
-gtk/gtkmm/hvseparator.h
-gtk/gtkmm/iconfactory.cc
-gtk/gtkmm/iconfactory.h
gtk/gtkmm/iconinfo.cc
gtk/gtkmm/iconinfo.h
-gtk/gtkmm/iconset.cc
-gtk/gtkmm/iconset.h
-gtk/gtkmm/iconsource.cc
-gtk/gtkmm/iconsource.h
gtk/gtkmm/icontheme.cc
gtk/gtkmm/icontheme.h
gtk/gtkmm/iconview.cc
gtk/gtkmm/iconview.h
gtk/gtkmm/image.cc
gtk/gtkmm/image.h
-gtk/gtkmm/imagemenuitem.cc
-gtk/gtkmm/imagemenuitem.h
gtk/gtkmm/infobar.cc
gtk/gtkmm/infobar.h
gtk/gtkmm/invisible.cc
@@ -350,16 +314,10 @@ gtk/gtkmm/menutoolbutton.cc
gtk/gtkmm/menutoolbutton.h
gtk/gtkmm/messagedialog.cc
gtk/gtkmm/messagedialog.h
-gtk/gtkmm/misc.cc
-gtk/gtkmm/misc.h
gtk/gtkmm/modelbutton.cc
gtk/gtkmm/modelbutton.h
gtk/gtkmm/notebook.cc
gtk/gtkmm/notebook.h
-gtk/gtkmm/numerableicon.cc
-gtk/gtkmm/numerableicon.h
-gtk/gtkmm/offscreenwindow.cc
-gtk/gtkmm/offscreenwindow.h
gtk/gtkmm/orientable.cc
gtk/gtkmm/orientable.h
gtk/gtkmm/overlay.cc
@@ -374,8 +332,6 @@ gtk/gtkmm/papersize.cc
gtk/gtkmm/papersize.h
gtk/gtkmm/placessidebar.cc
gtk/gtkmm/placessidebar.h
-gtk/gtkmm/plug.cc
-gtk/gtkmm/plug.h
gtk/gtkmm/popover.cc
gtk/gtkmm/popover.h
gtk/gtkmm/popovermenu.cc
@@ -396,8 +352,6 @@ gtk/gtkmm/printunixdialog.cc
gtk/gtkmm/printunixdialog.h
gtk/gtkmm/progressbar.cc
gtk/gtkmm/progressbar.h
-gtk/gtkmm/radioaction.cc
-gtk/gtkmm/radioaction.h
gtk/gtkmm/radiobutton.cc
gtk/gtkmm/radiobutton.h
gtk/gtkmm/radiomenuitem.cc
@@ -406,8 +360,6 @@ gtk/gtkmm/radiotoolbutton.cc
gtk/gtkmm/radiotoolbutton.h
gtk/gtkmm/range.cc
gtk/gtkmm/range.h
-gtk/gtkmm/recentaction.cc
-gtk/gtkmm/recentaction.h
gtk/gtkmm/recentchooser.cc
gtk/gtkmm/recentchooser.h
gtk/gtkmm/recentchooserdialog.cc
@@ -462,8 +414,6 @@ gtk/gtkmm/shortcutswindow.cc
gtk/gtkmm/shortcutswindow.h
gtk/gtkmm/sizegroup.cc
gtk/gtkmm/sizegroup.h
-gtk/gtkmm/socket.cc
-gtk/gtkmm/socket.h
gtk/gtkmm/spinbutton.cc
gtk/gtkmm/spinbutton.h
gtk/gtkmm/spinner.cc
@@ -476,22 +426,14 @@ gtk/gtkmm/stackswitcher.cc
gtk/gtkmm/stackswitcher.h
gtk/gtkmm/statusbar.cc
gtk/gtkmm/statusbar.h
-gtk/gtkmm/statusicon.cc
-gtk/gtkmm/statusicon.h
-gtk/gtkmm/stockitem.cc
-gtk/gtkmm/stockitem.h
gtk/gtkmm/stylecontext.cc
gtk/gtkmm/stylecontext.h
gtk/gtkmm/styleprovider.cc
gtk/gtkmm/styleprovider.h
gtk/gtkmm/switch.cc
gtk/gtkmm/switch.h
-gtk/gtkmm/table.cc
-gtk/gtkmm/table.h
gtk/gtkmm/targetlist.cc
gtk/gtkmm/targetlist.h
-gtk/gtkmm/tearoffmenuitem.cc
-gtk/gtkmm/tearoffmenuitem.h
gtk/gtkmm/textattributes.cc
gtk/gtkmm/textattributes.h
gtk/gtkmm/textbuffer.cc
@@ -508,8 +450,6 @@ gtk/gtkmm/texttagtable.cc
gtk/gtkmm/texttagtable.h
gtk/gtkmm/textview.cc
gtk/gtkmm/textview.h
-gtk/gtkmm/toggleaction.cc
-gtk/gtkmm/toggleaction.h
gtk/gtkmm/togglebutton.cc
gtk/gtkmm/togglebutton.h
gtk/gtkmm/toggletoolbutton.cc
@@ -554,8 +494,6 @@ gtk/gtkmm/treeview.cc
gtk/gtkmm/treeview.h
gtk/gtkmm/treeviewcolumn.cc
gtk/gtkmm/treeviewcolumn.h
-gtk/gtkmm/uimanager.cc
-gtk/gtkmm/uimanager.h
gtk/gtkmm/viewport.cc
gtk/gtkmm/viewport.h
gtk/gtkmm/volumebutton.cc
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index ce58de7..1d23bd2 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -64,12 +64,12 @@
*
* If your source file is @c program.cc, you can compile it with:
* @code
- * g++ program.cc -o program `pkg-config --cflags --libs gtkmm-3.0`
+ * g++ program.cc -o program `pkg-config --cflags --libs gtkmm-4.0`
* @endcode
*
* Alternatively, if using autoconf, use the following in @c configure.ac:
* @code
- * PKG_CHECK_MODULES([GTKMM], [gtkmm-3.0])
+ * PKG_CHECK_MODULES([GTKMM], [gtkmm-4.0])
* @endcode
* Then use the generated @c GTKMM_CFLAGS and @c GTKMM_LIBS variables in the
* project @c Makefile.am files. For example:
@@ -91,10 +91,6 @@ extern const int gtkmm_micro_version;
#include <gdkmm.h>
-//Include these first so they can do some undef/re-def magic for StockID.
-#include <gtkmm/toggleaction.h>
-#include <gtkmm/radioaction.h>
-
#include <gtkmm/object.h>
#include <gtkmm/aboutdialog.h>
#include <gtkmm/accelkey.h>
@@ -103,13 +99,11 @@ extern const int gtkmm_micro_version;
#include <gtkmm/actionable.h>
#include <gtkmm/actionbar.h>
#include <gtkmm/adjustment.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/appchooserbutton.h>
#include <gtkmm/appchooserdialog.h>
#include <gtkmm/appchooserwidget.h>
#include <gtkmm/application.h>
#include <gtkmm/applicationwindow.h>
-#include <gtkmm/arrow.h>
#include <gtkmm/aspectframe.h>
#include <gtkmm/assistant.h>
#include <gtkmm/base.h>
@@ -137,7 +131,6 @@ extern const int gtkmm_micro_version;
#include <gtkmm/colorbutton.h>
#include <gtkmm/colorchooser.h>
#include <gtkmm/colorchooserdialog.h>
-#include <gtkmm/colorselection.h>
#include <gtkmm/combobox.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/container.h>
@@ -163,7 +156,6 @@ extern const int gtkmm_micro_version;
#include <gtkmm/fontchooser.h>
#include <gtkmm/fontchooserdialog.h>
#include <gtkmm/fontchooserwidget.h>
-#include <gtkmm/fontselection.h>
#include <gtkmm/frame.h>
#include <gtkmm/gesture.h>
#include <gtkmm/gesturedrag.h>
@@ -176,21 +168,10 @@ extern const int gtkmm_micro_version;
#include <gtkmm/gesturezoom.h>
#include <gtkmm/glarea.h>
#include <gtkmm/grid.h>
-#include <gtkmm/handlebox.h>
#include <gtkmm/headerbar.h>
-#include <gtkmm/hvbox.h>
-#include <gtkmm/hvbuttonbox.h>
-#include <gtkmm/hvpaned.h>
-#include <gtkmm/hvscale.h>
-#include <gtkmm/hvscrollbar.h>
-#include <gtkmm/hvseparator.h>
-#include <gtkmm/iconset.h>
-#include <gtkmm/iconfactory.h>
-#include <gtkmm/iconsource.h>
#include <gtkmm/icontheme.h>
#include <gtkmm/iconview.h>
#include <gtkmm/image.h>
-#include <gtkmm/imagemenuitem.h>
#include <gtkmm/infobar.h>
#include <gtkmm/calendar.h>
#include <gtkmm/invisible.h>
@@ -209,12 +190,9 @@ extern const int gtkmm_micro_version;
#include <gtkmm/menuitem.h>
#include <gtkmm/menushell.h>
#include <gtkmm/messagedialog.h>
-#include <gtkmm/misc.h>
#include <gtkmm/modelbutton.h>
#include <gtkmm/notebook.h>
-#include <gtkmm/numerableicon.h>
#include <gtkmm/object.h>
-#include <gtkmm/offscreenwindow.h>
#include <gtkmm/overlay.h>
#include <gtkmm/paned.h>
#include <gtkmm/pagesetup.h>
@@ -241,7 +219,6 @@ extern const int gtkmm_micro_version;
#include <gtkmm/radiomenuitem.h>
#include <gtkmm/radiotoolbutton.h>
#include <gtkmm/range.h>
-#include <gtkmm/recentaction.h>
#include <gtkmm/recentchooser.h>
#include <gtkmm/recentchooserdialog.h>
#include <gtkmm/recentchoosermenu.h>
@@ -272,14 +249,9 @@ extern const int gtkmm_micro_version;
#include <gtkmm/stacksidebar.h>
#include <gtkmm/stackswitcher.h>
#include <gtkmm/statusbar.h>
-#include <gtkmm/statusicon.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/stockitem.h>
#include <gtkmm/stylecontext.h>
#include <gtkmm/styleproperty.h>
#include <gtkmm/switch.h>
-#include <gtkmm/table.h>
-#include <gtkmm/tearoffmenuitem.h>
#include <gtkmm/textbuffer.h>
#include <gtkmm/textchildanchor.h>
#include <gtkmm/textiter.h>
@@ -304,12 +276,10 @@ extern const int gtkmm_micro_version;
#include <gtkmm/treestore.h>
#include <gtkmm/treeview.h>
#include <gtkmm/treeviewcolumn.h>
-#include <gtkmm/uimanager.h>
#include <gtkmm/viewport.h>
#include <gtkmm/volumebutton.h>
#include <gtkmm/widget.h>
#include <gtkmm/widgetpath.h>
#include <gtkmm/window.h>
-#include <gtkmm/stockid.h>
#endif /* #ifndef GTKMM_H */
diff --git a/gtk/gtkmm/filelist.am b/gtk/gtkmm/filelist.am
index 6fa9358..04a80ae 100644
--- a/gtk/gtkmm/filelist.am
+++ b/gtk/gtkmm/filelist.am
@@ -19,9 +19,7 @@ gtkmm_files_extra_any_cc = \
treemodelcolumn.cc \
treeview_private.cc
-gtkmm_files_extra_deprecated_cc = \
- stock.cc \
- stockid.cc
+gtkmm_files_extra_deprecated_cc =
gtkmm_files_extra_any_h = \
accelkey.h \
@@ -41,9 +39,7 @@ gtkmm_files_extra_any_h = \
treeview_private.h \
wrap_init.h
-gtkmm_files_extra_deprecated_h = \
- stock.h \
- stockid.h
+gtkmm_files_extra_deprecated_h =
gtkmm_files_extra_ph = \
private/object_p.h
diff --git a/gtk/gtkmm/radiobuttongroup.cc b/gtk/gtkmm/radiobuttongroup.cc
index e0d6a24..1ac3d04 100644
--- a/gtk/gtkmm/radiobuttongroup.cc
+++ b/gtk/gtkmm/radiobuttongroup.cc
@@ -22,7 +22,6 @@
#include <gtkmm/radiobutton.h>
#include <gtkmm/radiomenuitem.h>
-#include <gtkmm/radioaction.h>
#include <gtkmm/radiotoolbutton.h>
#include <gtk/gtk.h>
@@ -65,16 +64,6 @@ void RadioButtonGroup::add(RadioMenuItem& item)
group_ = gtk_radio_menu_item_get_group(item.gobj());
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-void RadioButtonGroup::add(const Glib::RefPtr<RadioAction>& item)
-{
- item->set_group(*this);
-
- //probably not necessary:
- group_ = gtk_radio_action_get_group(item->gobj());
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
void RadioButtonGroup::add(RadioToolButton& item)
{
item.set_group(*this);
diff --git a/gtk/gtkmm/radiobuttongroup.h b/gtk/gtkmm/radiobuttongroup.h
index 0776ca1..f20cc14 100644
--- a/gtk/gtkmm/radiobuttongroup.h
+++ b/gtk/gtkmm/radiobuttongroup.h
@@ -57,7 +57,6 @@ protected:
friend class Gtk::RadioButton;
friend class Gtk::RadioMenuItem;
- friend class Gtk::RadioAction; //deprecated
friend class Gtk::RadioToolButton;
@@ -66,11 +65,6 @@ protected:
// Would that anything useful other than being tidy? murrayc
void add(RadioButton& item);
void add(RadioMenuItem& item);
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** @deprecated Because Gtk::RadioAction is deprecated.
- */
- void add(const Glib::RefPtr<RadioAction>& item);
-#endif // GTKMM_DISABLE_DEPRECATED
void add(RadioToolButton& item);
void* operator new(std::size_t); // not implemented
diff --git a/gtk/src/adjustment.hg b/gtk/src/adjustment.hg
index 71be6e9..ef3451e 100644
--- a/gtk/src/adjustment.hg
+++ b/gtk/src/adjustment.hg
@@ -63,11 +63,6 @@ protected:
public:
_WRAP_CREATE(double value, double lower, double upper, double step_increment = 1, double page_increment =
10, double page_size = 0)
- _WRAP_METHOD(void changed(), gtk_adjustment_changed,
- deprecated "GTK+ emits a 'changed' signal itself whenever any of the properties (other than value)
change.")
- _WRAP_METHOD(void value_changed(), gtk_adjustment_value_changed,
- deprecated "GTK+ emits a 'value_changed' signal itself whenever the value changes.")
-
_WRAP_METHOD(void clamp_page(double lower, double upper), gtk_adjustment_clamp_page)
_WRAP_METHOD(void set_value(double value), gtk_adjustment_set_value)
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index d89d6bc..252060f 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -19,7 +19,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <vector>
-#include <gtkmm/actiongroup.h>
#include <giomm/application.h>
#include <giomm/menumodel.h>
#include <giomm/menu.h>
@@ -316,10 +315,6 @@ public:
_WRAP_METHOD(void set_menubar(const Glib::RefPtr<Gio::MenuModel>& menubar), gtk_application_set_menubar)
- _WRAP_METHOD(void add_accelerator(const Glib::ustring& accelerator, const Glib::ustring& action_name,
GVariant* parameter{?}), gtk_application_add_accelerator, deprecated "Use set_accels_for_action() instead.")
-
- _WRAP_METHOD(void remove_accelerator(const Glib::ustring& action_name, GVariant* parameter{?}),
gtk_application_remove_accelerator, deprecated "Use set_accels_for_action() or unset_accels_for_action()
instead.")
-
_WRAP_METHOD(guint inhibit(Window& window, ApplicationInhibitFlags flags, const Glib::ustring& reason),
gtk_application_inhibit)
_WRAP_METHOD(void uninhibit(guint cookie), gtk_application_uninhibit)
_WRAP_METHOD(bool is_inhibited(ApplicationInhibitFlags flags) const, gtk_application_is_inhibited)
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index 4add455..9e34bd8 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -66,13 +66,6 @@ public:
_WRAP_METHOD(void set_page_title(const Widget& page, const Glib::ustring& title),
gtk_assistant_set_page_title)
_WRAP_METHOD(Glib::ustring get_page_title(const Widget& page) const, gtk_assistant_get_page_title)
- _WRAP_METHOD(void set_page_header_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf),
gtk_assistant_set_page_header_image, deprecated "A header is no longer shown. Add your header decoration to
the page content instead.")
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_header_image(const Widget& page),
gtk_assistant_get_page_header_image, deprecated "A header is no longer shown. Add your header decoration to
the page content instead.")
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_header_image(const Widget& page) const,
gtk_assistant_get_page_header_image, constversion, deprecated "A header is no longer shown. Aadd your header
decoration to the page content instead.")
- _WRAP_METHOD(void set_page_side_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf),
gtk_assistant_set_page_side_image, deprecated "Sidebar images are not shown anymore..")
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_side_image(const Widget& page),
gtk_assistant_get_page_side_image, deprecated "Sidebar images are not shown anymore..")
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_side_image(const Widget& page) const,
gtk_assistant_get_page_side_image, constversion, deprecated "Sidebar images are not shown anymore.")
-
_WRAP_METHOD(void set_page_complete(const Widget& page, bool complete = true),
gtk_assistant_set_page_complete)
_WRAP_METHOD(bool get_page_complete(const Widget& page) const, gtk_assistant_get_page_complete)
_WRAP_METHOD(void add_action_widget(Widget& child), gtk_assistant_add_action_widget)
diff --git a/gtk/src/bin.ccg b/gtk/src/bin.ccg
index ddb07d2..50d6b3b 100644
--- a/gtk/src/bin.ccg
+++ b/gtk/src/bin.ccg
@@ -33,23 +33,6 @@ Bin::remove()
Container::remove(*child);
}
-_DEPRECATE_IFDEF_START
-void
-Bin::add_label(const Glib::ustring& str, bool mnemonic /* = false */,
- double x_align /* = 0.5 */, double y_align /* = 0.5 */)
-{
- auto label = manage(new Label(str, x_align, y_align, mnemonic));
- add(*label);
-
- //This might not always be appropriate:
- //because maybe the mnemonic widget should be another child widget.
- //if(mnemonic)
- //label->set_mnemonic_widget(*this);
-
- label->show();
-}
-_DEPRECATE_IFDEF_END
-
void
Bin::add_label(const Glib::ustring& str, bool mnemonic,
Align x_align, Align y_align /* = ALIGN_CENTER */)
@@ -59,28 +42,6 @@ Bin::add_label(const Glib::ustring& str, bool mnemonic,
label->show();
}
-_DEPRECATE_IFDEF_START
-void
-Bin::add_pixlabel(const std::string& pixfile,
- const Glib::ustring& str,
- double x_align /* = 0.5 */, double y_align /* = 0.5 */)
-{
- //Create Image and Label widgets:
- auto pmap = manage(new Image(pixfile));
- auto label = manage(new Label(str));
- label->set_alignment (x_align, y_align);
-
- //Put them in a Box:
- auto hbox = manage(new Box(ORIENTATION_HORIZONTAL, 5));
- hbox->pack_start(*pmap, PACK_SHRINK);
- hbox->pack_start(*label);
- hbox->show_all();
-
- //And put that Box in this:
- add(*hbox);
-}
-_DEPRECATE_IFDEF_END
-
void
Bin::add_pixlabel(const std::string& pixfile,
const Glib::ustring& str,
diff --git a/gtk/src/bin.hg b/gtk/src/bin.hg
index 5e51794..f3a6967 100644
--- a/gtk/src/bin.hg
+++ b/gtk/src/bin.hg
@@ -61,24 +61,6 @@ public:
//Convenience methods that don't correspond to GTK+ functions:
-_DEPRECATE_IFDEF_START
- /** Add a Label object.
- * This does not correspond to any GTK+ function and is provided purely for
- * convenience.
- * @param label The text for the label.
- * @param mnemonic If <tt>true</tt>, characters preceded by an underscore
- * (_) will be underlined and used as a keyboard accelerator (shortcut).
- * @param x_align The horizontal alignment of the text. This ranges from
- * 0.0 (left aligned) to 1.0 (right aligned).
- * @param y_align The vertical alignment of the text. This ranges from
- * 0.0 (top aligned) to 1.0 (bottom aligned).
- *
- * @deprecated Use the other add_label().
- */
- void add_label(const Glib::ustring& label, bool mnemonic = false,
- double x_align = 0.5, double y_align = 0.5);
-_DEPRECATE_IFDEF_END
-
/** Add a Label object.
* This does not correspond to any GTK+ function and is provided purely for
* convenience.
@@ -90,13 +72,8 @@ _DEPRECATE_IFDEF_END
* @param y_align The vertical alignment of the text. For possible
* values, see Gtk::Align.
*/
-_DEPRECATE_IFDEF_START
- void add_label(const Glib::ustring& label, bool mnemonic,
- Align x_align, Align y_align = ALIGN_CENTER);
-#else
void add_label(const Glib::ustring& label, bool mnemonic = false,
Align x_align = ALIGN_CENTER, Align y_align = ALIGN_CENTER);
-_DEPRECATE_IFDEF_END
//TODO: Change this to Pixbuf?
/* Add Image and Label objects.
@@ -117,24 +94,6 @@ _DEPRECATE_IFDEF_END
Align x_align = ALIGN_CENTER, Align y_align = ALIGN_CENTER);
*/
-_DEPRECATE_IFDEF_START
- /** Add Image and Label objects.
- * This does not correspond to any GTK+ function and is provided purely for
- * convenience.
- * This will create, manage, add, and show a new Image and Label (within a
- * horizontal Box) to this Bin.
- * @param pixfile The path to a file to be displayed.
- * @param label The text for the label.
- * @param x_align The horizontal alignment of the text in the label.
- * @param y_align The vertical alignment of the text in the label.
- *
- * @deprecated Use the other add_pixlabel().
- */
- void add_pixlabel(const std::string& pixfile,
- const Glib::ustring& label,
- double x_align = 0.5, double y_align = 0.5);
-_DEPRECATE_IFDEF_END
-
/** Add Image and Label objects.
* This does not correspond to any GTK+ function and is provided purely for
* convenience.
@@ -147,15 +106,9 @@ _DEPRECATE_IFDEF_END
*
* @newin{3,14}
*/
-_DEPRECATE_IFDEF_START
- void add_pixlabel(const std::string& pixfile,
- const Glib::ustring& label,
- Align x_align, Align y_align = ALIGN_CENTER);
-#else
void add_pixlabel(const std::string& pixfile,
const Glib::ustring& label,
Align x_align = ALIGN_CENTER, Align y_align = ALIGN_CENTER);
-_DEPRECATE_IFDEF_END
};
} //namespace Gtk
diff --git a/gtk/src/box.ccg b/gtk/src/box.ccg
index 2991198..4c78ba4 100644
--- a/gtk/src/box.ccg
+++ b/gtk/src/box.ccg
@@ -23,20 +23,20 @@
namespace Gtk
{
-void Box::pack_start(Widget& child, PackOptions options, guint padding)
+void Box::pack_start(Widget& child, PackOptions options)
{
bool expand = (options == PACK_EXPAND_PADDING) || (options == PACK_EXPAND_WIDGET);
bool fill = (options == PACK_EXPAND_WIDGET);
- gtk_box_pack_start(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill, padding);
+ gtk_box_pack_start(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill);
}
-void Box::pack_end(Widget& child, PackOptions options, guint padding)
+void Box::pack_end(Widget& child, PackOptions options)
{
bool expand = (options == PACK_EXPAND_PADDING) || (options == PACK_EXPAND_WIDGET);
bool fill = (options == PACK_EXPAND_WIDGET);
- gtk_box_pack_end(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill, padding);
+ gtk_box_pack_end(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill);
}
void Box::unset_center_widget()
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index 1bf537c..5bf1a72 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -90,23 +90,21 @@ public:
*/
_WRAP_CTOR(Box(Orientation orientation = ORIENTATION_HORIZONTAL, int spacing = 0), gtk_box_new)
- _WRAP_METHOD(void pack_start(Widget& child, bool expand, bool fill, guint padding = 0), gtk_box_pack_start)
+ _WRAP_METHOD(void pack_start(Widget& child, bool expand, bool fill), gtk_box_pack_start)
/** Left side insert a widget to a box.
* @param child A Widget to be added to box.
* @param options Controls how the widget expands to fill space, and how the space around them is used.
- * @param padding Padding that is added on either side of the widget. This is different to spacing set
when the box is created (or with set_spacing()) - spacing is added between objects, and padding is added on
either side of an object.
*/
- void pack_start(Widget& child, PackOptions options = PACK_EXPAND_WIDGET, guint padding = 0);
+ void pack_start(Widget& child, PackOptions options = PACK_EXPAND_WIDGET);
- _WRAP_METHOD(void pack_end(Widget& child, bool expand, bool fill, guint padding = 0), gtk_box_pack_end)
+ _WRAP_METHOD(void pack_end(Widget& child, bool expand, bool fill), gtk_box_pack_end)
/** Right side insert a widget to a box.
* @param child A Widget to be added to box.
* @param options Controls how the widget expands to fill space, and how the space around them is used.
- * @param padding Padding that is added on either side of the widget. This is different to spacing set
when the box is created (or with set_spacing()) - spacing is added between objects, and padding is added on
either side of an object.
*/
- void pack_end(Widget& child, PackOptions options = PACK_EXPAND_WIDGET, guint padding = 0);
+ void pack_end(Widget& child, PackOptions options = PACK_EXPAND_WIDGET);
_WRAP_METHOD(void set_homogeneous(bool homogeneous = true), gtk_box_set_homogeneous)
_WRAP_METHOD(bool get_homogeneous() const, gtk_box_get_homogeneous)
@@ -134,15 +132,8 @@ public:
_WRAP_CHILD_PROPERTY("expand", bool)
_WRAP_CHILD_PROPERTY("fill", bool)
- _WRAP_CHILD_PROPERTY("padding", guint)
_WRAP_CHILD_PROPERTY("pack-type", PackType)
_WRAP_CHILD_PROPERTY("position", int)
};
} // namespace Gtk
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvbox.h>
-
diff --git a/gtk/src/button.ccg b/gtk/src/button.ccg
index 82fd22e..70bd67d 100644
--- a/gtk/src/button.ccg
+++ b/gtk/src/button.ccg
@@ -17,7 +17,6 @@
*/
#include <gtk/gtk.h>
-#include <gtkmm/stock.h>
#include <gtkmm/image.h>
namespace Gtk
@@ -28,43 +27,5 @@ Button::Button(const Glib::ustring& label, bool mnemonic)
_CONSTRUCT("label", label.c_str(), "use_underline", gboolean(mnemonic))
{}
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-Button::Button(const StockID& stock_id)
-:
- _CONSTRUCT("use_stock", 1, "label", stock_id.get_c_str())
-{}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-void Button::set_image_from_icon_name(const Glib::ustring& icon_name, IconSize size)
-{
- auto image = Gtk::manage(new Image());
- image->set_from_icon_name(icon_name, size);
- set_image(*image);
-}
-
-void Button::set_image_from_icon_name(const Glib::ustring& icon_name, IconSize size, bool use_fallback)
-{
- auto image = Gtk::manage(new Image());
- image->set_from_icon_name(icon_name, size);
- image->property_use_fallback() = use_fallback;
- set_image(*image);
-}
-
-// GtkButton:focus-on-click has been removed from gtk+.
-// TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > Button::property_focus_on_click()
-{
- return Glib::PropertyProxy< bool >(this, "focus-on-click");
-}
-
-Glib::PropertyProxy_ReadOnly< bool > Button::property_focus_on_click() const
-{
- return Glib::PropertyProxy_ReadOnly< bool >(this, "focus-on-click");
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
} // namespace Gtk
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 7d82e0d..d931408 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -17,7 +17,7 @@
*/
#include <gtkmm/bin.h>
-#include <gtkmm/activatable.h>
+#include <gtkmm/actionable.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
@@ -25,10 +25,6 @@ _PINCLUDE(gtkmm/private/bin_p.h)
namespace Gtk
{
-class StockID; //deprecated
-
-//TODO: Derive from (and implement) Actionable when we can break ABI.
-
/** A widget that creates a signal when clicked on.
*
* This widget is generally used with a signal handler that is called when the button is pressed.
@@ -41,10 +37,10 @@ class StockID; //deprecated
*/
class Button
: public Bin,
- public Activatable
+ public Actionable
{
_CLASS_GTKOBJECT(Button,GtkButton,GTK_BUTTON,Gtk::Bin,GtkBin)
- _IMPLEMENTS_INTERFACE(Activatable)
+ _IMPLEMENTS_INTERFACE(Actionable)
public:
/** Create an empty button.
@@ -67,20 +63,10 @@ public:
explicit Button(const Glib::ustring& label, bool mnemonic = false);
//We don't wrap gtk_button_new_from_icon_name() to avoid a clash with the label constructor.
- //But set_image_from_icon_name() is a replacement.
+ //But set_icon_name() is a replacement.
_IGNORE(gtk_button_new_from_icon_name)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new Button containing the image and text from a stock item.
- * Stock ids have identifiers like Gtk::Stock::OK and Gtk::Stock::APPLY.
- * @param stock_id The stock item.
- * @deprecated Use the constructor that takes a Glib::ustring label or set_image_from_icon_name() instead,
because stock IDs are now deprecated.
- */
- explicit Button(const StockID& stock_id);
-#endif //GTKMM_DISABLE_DEPRECATED
-
_WRAP_METHOD(void clicked(), gtk_button_clicked)
- _IGNORE(gtk_button_pressed, gtk_button_released, gtk_button_enter, gtk_button_leave) //deprecated
_WRAP_METHOD(void set_relief(ReliefStyle relief), gtk_button_set_relief)
_WRAP_METHOD(ReliefStyle get_relief() const, gtk_button_get_relief)
@@ -89,106 +75,20 @@ public:
_WRAP_METHOD(Glib::ustring get_label() const, gtk_button_get_label)
_WRAP_METHOD(void set_use_underline(bool use_underline = true), gtk_button_set_use_underline)
_WRAP_METHOD(bool get_use_underline() const, gtk_button_get_use_underline)
- _WRAP_METHOD(void set_use_stock(bool use_stock = true), gtk_button_set_use_stock, deprecated "No
replacement available.")
- _WRAP_METHOD(bool get_use_stock() const, gtk_button_get_use_stock, deprecated "No replacement available.")
-
- _WRAP_METHOD(void set_focus_on_click(bool focus_on_click = true), gtk_button_set_focus_on_click,
- deprecated "Use Widget::set_focus_on_click() instead.")
- _WRAP_METHOD(bool get_focus_on_click() const, gtk_button_get_focus_on_click,
- deprecated "Use Widget::get_focus_on_click() instead.")
-
- _WRAP_METHOD(void set_alignment(float xalign, float yalign), gtk_button_set_alignment, deprecated "Access
the child widget directly if you need to control its alignment.")
- _WRAP_METHOD(void get_alignment(float& xalign, float& yalign), gtk_button_get_alignment, deprecated
"Access the child widget directly if you need to control its alignment.")
-
- //TODO: When we can break ABI, combine the two set_image_from_icon_name() to
- // void set_image_from_icon_name(const Glib::ustring& icon_name, IconSize size = ICON_SIZE_BUTTON, bool
use_fallback = false);
- /** Sets the image to an icon from the current icon theme.
- * If the icon name isn't known, a "broken image" icon will be
- * displayed instead. If the current icon theme is changed, the icon
- * will be updated appropriately.
- * The icon will be displayed if there is no label text or if
- * Gtk::Button::property_always_show_image() is <tt>true</tt>.
- *
- * This is a convenience wrapper around Gtk::Image::set_from_icon_name() and
- * Gtk::Button:set_image().
- *
- * @param icon_name An icon name.
- * @param size An icon size. Can be either an IconSize or a BuiltinIconSize.
- *
- * @newin{3,10}
- */
- void set_image_from_icon_name(const Glib::ustring& icon_name, IconSize size = ICON_SIZE_BUTTON);
-
- /** Sets the image to an icon from the current icon theme.
- * If the icon name isn't known, a "broken image" icon will be
- * displayed instead. If the current icon theme is changed, the icon
- * will be updated appropriately.
- * The icon will be displayed if there is no label text or if
- * Gtk::Button::property_always_show_image() is <tt>true</tt>.
- *
- * This is a convenience wrapper around Gtk::Image::set_from_icon_name() and
- * Gtk::Button:set_image().
- *
- * @param icon_name An icon name.
- * @param size An icon size. Can be either an IconSize or a BuiltinIconSize.
- * @param use_fallback Whether the icon displayed in the Gtk::Image will use
- * standard icon names fallback. See also Gtk::ICON_LOOKUP_GENERIC_FALLBACK.
- *
- * @newin{3,12}
- */
- void set_image_from_icon_name(const Glib::ustring& icon_name, IconSize size, bool use_fallback);
-
- _WRAP_METHOD(void set_image(Widget& image), gtk_button_set_image)
- _WRAP_METHOD(Widget* get_image(), gtk_button_get_image)
- _WRAP_METHOD(const Widget* get_image() const, gtk_button_get_image, constversion)
-
- _WRAP_METHOD(void set_image_position(PositionType position), gtk_button_set_image_position)
- _WRAP_METHOD(PositionType get_image_position() const, gtk_button_get_image_position)
-
- _WRAP_METHOD(void set_always_show_image(bool always_show = true), gtk_button_set_always_show_image)
- _WRAP_METHOD(bool get_always_show_image(), gtk_button_get_always_show_image)
_WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_event_window(), gtk_button_get_event_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_event_window() const, gtk_button_get_event_window,
refreturn, constversion)
- _WRAP_SIGNAL(void pressed(), "pressed", deprecated "Use Widget::signal_button_press_event() instead.")
- _WRAP_SIGNAL(void released(), "released", deprecated "Use Widget::signal_button_release_event() instead.")
+ _WRAP_METHOD(void set_icon_name(const Glib::ustring& icon_name), gtk_button_set_icon_name)
+ _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_button_get_icon_name)
+
_WRAP_SIGNAL(void clicked(), "clicked")
- _WRAP_SIGNAL(void enter(), "enter", deprecated "Use Widget::signal_enter_notify_event() instead.")
- _WRAP_SIGNAL(void leave(), "leave", deprecated "Use Widget::signal_leave_notify_event() instead.")
_WRAP_SIGNAL(void activate(), "activate", deprecated "Use signal_clicked() instead.")
_WRAP_PROPERTY("label", Glib::ustring)
_WRAP_PROPERTY("relief", ReliefStyle)
_WRAP_PROPERTY("use-underline", bool)
- _WRAP_PROPERTY("use-stock", bool, deprecated "No replacement available.")
-
- // GtkButton:focus-on-click has been removed from gtk+.
- // TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Whether the button grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy that allows you to get or set the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy< bool > property_focus_on_click() ;
-
- /** Whether the button grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy_ReadOnly that allows you to get the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy_ReadOnly< bool > property_focus_on_click() const;
-#endif // GTKMM_DISABLE_DEPRECATED
- //_WRAP_PROPERTY("focus-on-click", bool, deprecated "Use Widget::property_focus_on_click() instead.")
-
- _WRAP_PROPERTY("xalign", float, deprecated "Access the child widget directly if you need to control its
alignment.")
- _WRAP_PROPERTY("yalign", float, deprecated "Access the child widget directly if you need to control its
alignment.")
- _WRAP_PROPERTY("image", Gtk::Widget*)
- _WRAP_PROPERTY("image-position", PositionType)
- _WRAP_PROPERTY("always-show-image", bool)
+ _WRAP_PROPERTY("icon-name", Glib::ustring)
};
/*! A Gtk::Button example.
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index 880e0f2..365fd26 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -72,8 +72,3 @@ public:
};
} // namespace Gtk
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvbuttonbox.h>
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 6507f3e..83e61e5 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -133,7 +133,6 @@ public:
_WRAP_PROPERTY("is-expander", bool)
_WRAP_PROPERTY("is-expanded", bool)
_WRAP_PROPERTY("cell-background", Glib::ustring)
- _WRAP_PROPERTY("cell-background-gdk", Gdk::Color, deprecated "Use property_cell_background_rgba()
instead.")
_WRAP_PROPERTY("cell-background-rgba", Gdk::RGBA)
_WRAP_PROPERTY("cell-background-set", bool)
_WRAP_PROPERTY("editing", bool)
diff --git a/gtk/src/cellrendererpixbuf.hg b/gtk/src/cellrendererpixbuf.hg
index e2cf5e4..a65c5b2 100644
--- a/gtk/src/cellrendererpixbuf.hg
+++ b/gtk/src/cellrendererpixbuf.hg
@@ -27,7 +27,7 @@ namespace Gtk
/** Renders a pixbuf in a cell.
* A CellRendererPixbuf can be used to render an image in a cell. It allows you to render either a
- * given Pixbuf (set via the pixbuf property) or a stock icon (set via the stock_id property).
+ * given Pixbuf (set via the pixbuf property) or a named icon (set via the icon_name property).
*
* To support the tree view, CellRendererPixbuf also supports rendering two alternative pixbufs, when
* the is_expanded property is true. If the is_expanded property is true and the pixbuf_expander_open
@@ -46,11 +46,9 @@ public:
_WRAP_PROPERTY("pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
_WRAP_PROPERTY("pixbuf_expander_open", Glib::RefPtr<Gdk::Pixbuf>)
_WRAP_PROPERTY("pixbuf_expander_closed", Glib::RefPtr<Gdk::Pixbuf>)
- _WRAP_PROPERTY("stock_id", Glib::ustring, deprecated "Use property_icon_name() instead.")
_WRAP_PROPERTY("stock_size", guint)
_WRAP_PROPERTY("stock_detail", Glib::ustring)
_WRAP_PROPERTY("icon-name", Glib::ustring)
- _WRAP_PROPERTY("follow-state", bool, deprecated "Cell renderers always follow state.")
_WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>)
_WRAP_PROPERTY("surface", ::Cairo::RefPtr< ::Cairo::Surface>)
diff --git a/gtk/src/cellrenderertext.hg b/gtk/src/cellrenderertext.hg
index 4495e14..356bc95 100644
--- a/gtk/src/cellrenderertext.hg
+++ b/gtk/src/cellrenderertext.hg
@@ -45,8 +45,6 @@ public:
_WRAP_PROPERTY("attributes", Pango::AttrList)
_WRAP_PROPERTY("background", Glib::ustring)
_WRAP_PROPERTY("foreground", Glib::ustring)
- _WRAP_PROPERTY("background-gdk", Gdk::Color, deprecated "Use property_background_rgba() instead.")
- _WRAP_PROPERTY("foreground-gdk", Gdk::Color, deprecated "Use property_background_rgba() instead.")
_WRAP_PROPERTY("background-rgba", Gdk::RGBA)
_WRAP_PROPERTY("foreground-rgba", Gdk::RGBA)
_WRAP_PROPERTY("font", Glib::ustring)
diff --git a/gtk/src/cellrenderertoggle.hg b/gtk/src/cellrenderertoggle.hg
index 76b7528..2395808 100644
--- a/gtk/src/cellrenderertoggle.hg
+++ b/gtk/src/cellrenderertoggle.hg
@@ -54,8 +54,6 @@ public:
_WRAP_PROPERTY("active", bool)
_WRAP_PROPERTY("inconsistent", bool)
_WRAP_PROPERTY("radio", bool)
- _WRAP_PROPERTY("indicator-size", int,
- deprecated "Use the min-width/min-height CSS properties of the check/radio node instead.")
Glib::PropertyProxy_Base _property_renderable() override;
};
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index cc45dee..145f48d 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -84,9 +84,7 @@ public:
_WRAP_METHOD(void set_displayed_row(const TreeModel::Path& path), gtk_cell_view_set_displayed_row)
_WRAP_METHOD(TreeModel::Path get_displayed_row() const, gtk_cell_view_get_displayed_row)
- _IGNORE(gtk_cell_view_get_size_of_row) //deprecated
- _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color,
deprecated "Use set_background_rgba instead.")
_WRAP_METHOD(void set_background_rgba(const Gdk::RGBA& rgba), gtk_cell_view_set_background_rgba)
_WRAP_METHOD(bool get_draw_sensitive() const, gtk_cell_view_get_draw_sensitive)
@@ -95,7 +93,6 @@ public:
_WRAP_METHOD(void set_fit_model(bool fit_model = true), gtk_cell_view_set_fit_model)
_WRAP_PROPERTY("background", Glib::ustring)
- _WRAP_PROPERTY("background-gdk", Gdk::Color, deprecated "Use property_background_rgba() instead.")
_WRAP_PROPERTY("background-rgba", Gdk::RGBA)
_WRAP_PROPERTY("background-set", bool)
_WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
diff --git a/gtk/src/checkmenuitem.ccg b/gtk/src/checkmenuitem.ccg
index d838f81..7ff9f42 100644
--- a/gtk/src/checkmenuitem.ccg
+++ b/gtk/src/checkmenuitem.ccg
@@ -17,7 +17,6 @@
*/
#include <gtk/gtk.h>
-#include <gtkmm/misc.h>
#include <gtkmm/label.h>
namespace Gtk
diff --git a/gtk/src/colorbutton.ccg b/gtk/src/colorbutton.ccg
index 5d3bf4a..11d46bd 100644
--- a/gtk/src/colorbutton.ccg
+++ b/gtk/src/colorbutton.ccg
@@ -17,39 +17,7 @@
*/
#include <gtk/gtk.h>
-#include <gdkmm/color.h>
namespace Gtk
{
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-ColorButton::ColorButton(const Gdk::Color& color)
-:
- // Mark this class as non-derived to allow C++ vfuncs to be skipped.
- Glib::ObjectBase(nullptr),
- Gtk::Button(Glib::ConstructParams(colorbutton_class_.init(), "color", (color).gobj(), nullptr))
-{
-}
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-
-Gdk::Color ColorButton::get_color() const
-{
- Gdk::Color color;
- gtk_color_button_get_color(const_cast<GtkColorButton*>(gobj()), color.gobj());
- return color;
-}
-
-#endif //GTKMM_DISABLE_DEPRECATED
-
-Gdk::RGBA ColorButton::get_rgba() const
-{
- Gdk::RGBA color;
- gtk_color_button_get_rgba(const_cast<GtkColorButton*>(gobj()), color.gobj());
- return color;
-}
-
-
-
} // namespace Gtk
diff --git a/gtk/src/colorbutton.hg b/gtk/src/colorbutton.hg
index 5941bb3..39215b3 100644
--- a/gtk/src/colorbutton.hg
+++ b/gtk/src/colorbutton.hg
@@ -17,7 +17,7 @@
*/
#include <gtkmm/button.h>
-#include <gdkmm/color.h>
+#include <gtkmm/colorchooser.h>
#include <gdkmm/rgba.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/button_p.h)
@@ -30,8 +30,6 @@ _PINCLUDE(gtkmm/private/button_p.h)
namespace Gtk
{
-//TODO: Derive from (and implement) ColorChooser when we can break ABI.
-
/** A button to launch a color selection dialog.
*
* The GtkColorButton is a button which displays the currently selected color an allows to
@@ -43,11 +41,12 @@ namespace Gtk
*
* @ingroup Widgets
*/
-class ColorButton : public Button
- //TODO: When we can break ABI: public ColorChooser
+class ColorButton
+: public Button,
+ public ColorChooser
{
_CLASS_GTKOBJECT(ColorButton, GtkColorButton, GTK_COLOR_BUTTON, Gtk::Button, GtkButton)
- //TODO: When we can break ABI: _IMPLEMENTS_INTERFACE(ColorChooser)
+ _IMPLEMENTS_INTERFACE(ColorChooser)
public:
/** Creates a new color button.
@@ -62,28 +61,10 @@ public:
_CTOR_DEFAULT()
_IGNORE(gtk_color_button_new)
- // _WRAP_CTOR does not take a 'deprecated' parameter.
- // _WRAP_CTOR(ColorButton(const Gdk::Color& color), gtk_color_button_new_with_color)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new color button with a predefined color.
- *
- * Same as Gtk::ColorButton::ColorButton(). Additionally takes a Gdk::Color and
- * initializes the button with this color. Equivalent to calling set_color(@a color)
- * after the default constructor.
- *
- * @param color A Gdk::Color to set the current color with.
- *
- * @newin{2,4}
- * @deprecated "Use the constructor that takes a Gdk::RGBA instead."
- */
- explicit ColorButton(const Gdk::Color& color);
- _IGNORE(gtk_color_button_new_with_color)
-#endif //GTKMM_DISABLE_DEPRECATED
-
/** Creates a new color button with a predefined color.
*
* Same as Gtk::ColorButton::ColorButton(). Additionally takes a Gdk::RGBA and
- * initializes the button with this color. Equivalent to calling set_rgba(@a color)
+ * initializes the button with this color. Equivalent to calling ColorChooser::set_rgba(@a rgba)
* after the default constructor.
*
* @param rgba A Gdk::RGBA to set the current color with.
@@ -92,56 +73,12 @@ public:
*/
_WRAP_CTOR(ColorButton(const Gdk::RGBA& rgba), gtk_color_button_new_with_rgba)
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::set_rgba()
instead."
- _WRAP_METHOD(void set_color(const Gdk::Color& color), gtk_color_button_set_color, deprecated "Use
set_rgba() instead.")
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::set_rgba()
instead."
- _WRAP_METHOD(void set_alpha(guint16 alpha), gtk_color_button_set_alpha, deprecated "Use set_rgba()
instead.")
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::set_rgba()
instead."
- _WRAP_METHOD(void set_rgba(const Gdk::RGBA& rgba), gtk_color_button_set_rgba)
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-
- //TODO: When we can implement interface ColorChooser: deprecated Use Gtk::ColorChooser::get_rgba() instead.
- /** Returns a copy of the the current color.
- *
- * Changes to the return value will have no effect on the Gtk::ColorButton.
- *
- * @return A Gdk::Color representing the current internal color of the Gtk::ColorButton.
- *
- * @newin{2,4}
- * @deprecated Use get_rgba() instead.
- */
- Gdk::Color get_color() const;
- _IGNORE(gtk_color_button_get_color)
-
-#endif //GTKMM_DISABLE_DEPRECATED
-
- //TODO: When we can implement interface ColorChooser: deprecated Use Gtk::ColorChooser::get_rgba() instead.
- /** Returns a copy of the the current color.
- *
- * Changes to the return value will have no effect on the Gtk::ColorButton.
- *
- * @return A Gdk::RGBA representing the current internal color of the Gtk::ColorButton.
- *
- * @newin{3,0}
- */
- Gdk::RGBA get_rgba() const;
- _IGNORE(gtk_color_button_get_rgba)
-
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::get_rgba()
instead."
- _WRAP_METHOD(guint16 get_alpha() const, gtk_color_button_get_alpha, deprecated "Use get_rgba() instead.")
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::set_use_alpha()
instead."
- _WRAP_METHOD(void set_use_alpha(bool use_alpha = true), gtk_color_button_set_use_alpha)
- //TODO: When we can implement interface ColorChooser: deprecated "Use Gtk::ColorChooser::get_use_alpha()
instead."
- _WRAP_METHOD(bool get_use_alpha() const, gtk_color_button_get_use_alpha)
_WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_color_button_set_title)
_WRAP_METHOD(Glib::ustring get_title() const, gtk_color_button_get_title)
_WRAP_PROPERTY("use-alpha", bool)
_WRAP_PROPERTY("title", Glib::ustring)
- _WRAP_PROPERTY("color", Gdk::Color, deprecated "Use property_rgba() instead.")
_WRAP_PROPERTY("rgba", Gdk::RGBA)
- _WRAP_PROPERTY("alpha", guint16) //Todo: Remove this when we remove the "color" property too.
_WRAP_PROPERTY("show-editor", bool)
_WRAP_SIGNAL(void color_set(), "color-set")
diff --git a/gtk/src/combobox.ccg b/gtk/src/combobox.ccg
index 13e4c05..e8f296b 100644
--- a/gtk/src/combobox.ccg
+++ b/gtk/src/combobox.ccg
@@ -120,18 +120,4 @@ Glib::ustring ComboBox::get_entry_text() const
return entry->get_text();
}
-// GtkComboBox:focus-on-click has been removed from gtk+.
-// TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > ComboBox::property_focus_on_click()
-{
- return Glib::PropertyProxy< bool >(this, "focus-on-click");
-}
-
-Glib::PropertyProxy_ReadOnly< bool > ComboBox::property_focus_on_click() const
-{
- return Glib::PropertyProxy_ReadOnly< bool >(this, "focus-on-click");
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
} // namespace Gtk
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 62cc24c..5d62c03 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -99,17 +99,6 @@ public:
_WRAP_METHOD(void set_column_span_column(int column_span), gtk_combo_box_set_column_span_column)
_WRAP_METHOD(int get_column_span_column() const, gtk_combo_box_get_column_span_column)
- _WRAP_METHOD(bool get_add_tearoffs() const, gtk_combo_box_get_add_tearoffs, deprecated "No replacement
available.")
- _WRAP_METHOD(void set_add_tearoffs(bool add_tearoffs = true), gtk_combo_box_set_add_tearoffs, deprecated
"No replacement available.")
-
- _WRAP_METHOD(Glib::ustring get_title() const, gtk_combo_box_get_title, deprecated "No replacement
available.")
- _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_combo_box_set_title, deprecated "No
replacement available.")
-
- _WRAP_METHOD(bool get_focus_on_click() const, gtk_combo_box_get_focus_on_click,
- deprecated "Use Widget::get_focus_on_click() instead.")
- _WRAP_METHOD(void set_focus_on_click(bool focus_on_click = true), gtk_combo_box_set_focus_on_click,
- deprecated "Use Widget::set_focus_on_click() instead.")
-
/* get/set active item */
_WRAP_METHOD(int get_active_row_number() const, gtk_combo_box_get_active)
@@ -219,31 +208,7 @@ public:
_WRAP_PROPERTY("row_span_column", int)
_WRAP_PROPERTY("column_span_column", int)
_WRAP_PROPERTY("active", int)
- _WRAP_PROPERTY("add-tearoffs", bool, deprecated "No replacement available.")
_WRAP_PROPERTY("has-frame", bool)
-
- // GtkComboBox:focus-on-click has been removed from gtk+.
- // TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Whether the combo box grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy that allows you to get or set the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy< bool > property_focus_on_click() ;
-
- /** Whether the combo box grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy_ReadOnly that allows you to get the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy_ReadOnly< bool > property_focus_on_click() const;
-#endif // GTKMM_DISABLE_DEPRECATED
- //_WRAP_PROPERTY("focus-on-click", bool, deprecated "Use Widget::property_focus_on_click() instead.")
-
- _WRAP_PROPERTY("tearoff-title", Glib::ustring, deprecated "No replacement available.")
_WRAP_PROPERTY("popup-shown", bool)
_WRAP_PROPERTY("button-sensitivity", SensitivityType)
_WRAP_PROPERTY("popup-fixed-width", bool)
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index 881b8f3..177e077 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -60,12 +60,6 @@ public:
/* Application-level methods */
- _WRAP_METHOD(void set_border_width(guint border_width),
- gtk_container_set_border_width)
-
- _WRAP_METHOD(guint get_border_width() const,
- gtk_container_get_border_width)
-
//This is virtual so that we can override it in Gtk::ScrolledWindow.
//TODO: Remove the virtual keyword when we can break ABI,
//because the override in ScrolledWindow is no longer necessary.
@@ -87,14 +81,6 @@ public:
void remove(Widget& widget);
_IGNORE(gtk_container_remove)
- _WRAP_METHOD(void set_resize_mode(ResizeMode resize_mode),
- gtk_container_set_resize_mode,
- deprecated "Resize modes are deprecated. They aren’t necessary anymore since frame clocks and
might introduce obscure bugs if used.")
-
- _WRAP_METHOD(ResizeMode get_resize_mode() const,
- gtk_container_get_resize_mode,
- deprecated "Resize modes are deprecated. They aren’t necessary anymore since frame clocks and
might introduce obscure bugs if used.")
-
/// Request that contained widgets check their size
_WRAP_METHOD(void check_resize(), gtk_container_check_resize)
@@ -149,10 +135,6 @@ public:
/* Widget-level methods */
- _WRAP_METHOD(void set_reallocate_redraws(bool needs_redraws = true),
- gtk_container_set_reallocate_redraws,
- deprecated "Call Gtk::Widget::queue_draw() in your Gtk::Widget::signal_size_allocate()
handler.")
-
/// Sets the focus on a child
_WRAP_METHOD(void set_focus_child(Widget& widget),gtk_container_set_focus_child)
@@ -175,10 +157,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<const Adjustment> get_focus_hadjustment() const,
gtk_container_get_focus_hadjustment, refreturn, constversion)
- /** @deprecated No replacement available.
- */
- _WRAP_METHOD(void resize_children(), gtk_container_resize_children, deprecated "No replacement available.")
-
_WRAP_METHOD(GType child_type() const, gtk_container_child_type)
_WRAP_METHOD(WidgetPath get_path_for_child(const Widget& child) const, gtk_container_get_path_for_child)
@@ -223,21 +201,6 @@ protected:
*/
_WRAP_VFUNC(void forall(gboolean include_internals, GtkCallback callback, gpointer callback_data), forall)
- //TODO: Return a ustring instead when we can break ABI.
- /** Returns the composite name of a child widget.
- *
- * Composite widgets are children of the container that are considered
- * "internal" (implementation details of the container). "Internal" children
- * generally weren't added by the user of the container, but were added by
- * the container implementation itself.
- *
- * The caller is responsible for freeing the returned string.
- *
- * @param child The child widget.
- * @returns The composite name of the child widget.
- */
- _WRAP_VFUNC(char* composite_name(GtkWidget* child), composite_name)
-
/** Sets a child property for this container and its child.
*
* Child properties are object properties that are not specific to either the
@@ -266,11 +229,6 @@ protected:
*/
_WRAP_VFUNC(void get_child_property(GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec)
const, get_child_property)
- _WRAP_PROPERTY("border_width", guint)
- _WRAP_PROPERTY("resize_mode", ResizeMode,
- deprecated "Resize modes are deprecated. They aren’t necessary anymore since frame clocks and might
introduce obscure bugs if used.")
- _WRAP_PROPERTY("child", Widget*)
-
#m4begin
dnl// Hook in special code to catch explicit uses of gtk_object_destroy() by
dnl// GTK+ code, e.g. when receiving the GDK_DELETE event. For details, look
diff --git a/gtk/src/cssprovider.ccg b/gtk/src/cssprovider.ccg
index 666fe47..04ff112 100644
--- a/gtk/src/cssprovider.ccg
+++ b/gtk/src/cssprovider.ccg
@@ -53,14 +53,9 @@ static void CssProvider_signal_parsing_error_callback(GtkCssProvider* self, GtkC
namespace Gtk
{
-bool CssProvider::load_from_data(const std::string& data)
+void CssProvider::load_from_data(const std::string& data)
{
- GError* gerror = nullptr;
- bool retvalue = gtk_css_provider_load_from_data(gobj(), data.c_str(), -1, &(gerror));
- if(gerror)
- Glib::Error::throw_exception(gerror);
-
- return retvalue;
+ gtk_css_provider_load_from_data(gobj(), data.c_str(), -1);
}
//TODO: When we can break ABI, remove no_default_handler in _WRAP_SIGNAL and
diff --git a/gtk/src/cssprovider.hg b/gtk/src/cssprovider.hg
index c982209..7d4f7e2 100644
--- a/gtk/src/cssprovider.hg
+++ b/gtk/src/cssprovider.hg
@@ -58,19 +58,15 @@ public:
_WRAP_METHOD(Glib::ustring to_string() const, gtk_css_provider_to_string)
- // TODO: Remove the bool return value when we can break ABI.
- // The return value has been deprecated in the C API anyway.
/** Loads @a data into this css provider, making it clear any previously loaded information.
*
* @param data CSS data loaded in memory.
- * @result True if the data could be loaded, though an exception will always be thrown if this would
return false.
- * @throws CssProviderError
*/
- bool load_from_data(const std::string& data);
+ void load_from_data(const std::string& data);
_IGNORE(gtk_css_provider_load_from_data)
- _WRAP_METHOD(bool load_from_file(const Glib::RefPtr<const Gio::File>& file),
gtk_css_provider_load_from_file, errthrow)
- _WRAP_METHOD(bool load_from_path(const std::string& path), gtk_css_provider_load_from_path, errthrow)
+ _WRAP_METHOD(void load_from_file(const Glib::RefPtr<const Gio::File>& file),
gtk_css_provider_load_from_file)
+ _WRAP_METHOD(void load_from_path(const std::string& path), gtk_css_provider_load_from_path)
_WRAP_METHOD(void load_from_resource(const std::string& resource_path),
gtk_css_provider_load_from_resource)
_WRAP_METHOD(static Glib::RefPtr<CssProvider> get_default(), gtk_css_provider_get_default, refreturn)
diff --git a/gtk/src/dialog.ccg b/gtk/src/dialog.ccg
index dc0af8f..c21903c 100644
--- a/gtk/src/dialog.ccg
+++ b/gtk/src/dialog.ccg
@@ -52,13 +52,4 @@ Dialog::Dialog(const Glib::ustring& title, Gtk::Window& parent, DialogFlags flag
property_destroy_with_parent() = (flags & DIALOG_DESTROY_WITH_PARENT) != 0;
}
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Dialog::set_alternative_button_order_from_array(const std::vector<int>& new_order)
-{
- gtk_dialog_set_alternative_button_order_from_array(gobj(), new_order.size(),
const_cast<int*>(Glib::ArrayHandler<int>::vector_to_array(new_order).data()));
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
-
} // namespace Gtk
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 7de09f6..15f8fee 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -84,39 +84,12 @@ public:
_WRAP_METHOD(void add_action_widget(Widget& child, int response_id), gtk_dialog_add_action_widget)
_WRAP_METHOD(Button* add_button(const Glib::ustring& button_text, int response_id), gtk_dialog_add_button)
- _WRAP_METHOD(Button* add_button(const Gtk::StockID& stock_id, int response_id), gtk_dialog_add_button,
deprecated "Use the add_button() that takes a Glib::ustring instead.")
_WRAP_METHOD(void set_response_sensitive(int response_id, bool setting = true),
gtk_dialog_set_response_sensitive)
_WRAP_METHOD(void set_default_response(int response_id), gtk_dialog_set_default_response)
_WRAP_METHOD(Widget* get_widget_for_response(int response_id), gtk_dialog_get_widget_for_response)
_WRAP_METHOD(const Widget* get_widget_for_response(int response_id) const,
gtk_dialog_get_widget_for_response, constversion)
_WRAP_METHOD(int get_response_for_widget(const Gtk::Widget& widget) const,
gtk_dialog_get_response_for_widget)
- _WRAP_METHOD(static bool alternative_button_order(const Glib::RefPtr<const Gdk::Screen>& screen),
gtk_alternative_dialog_button_order, deprecated "This should no longer be used.")
-
-_DEPRECATE_IFDEF_START
- /** Sets an alternative button order. If the gtk-alternative-button-order
- * setting is set to true, the dialog buttons are reordered according to
- * the order of the response ids in @a new_order.
- *
- * By default, GTK+ dialogs use the button order advocated by the Gnome
- * <a href="http://developer.gnome.org/hig-book/stable/";>Human
- * Interface Guidelines</a> with the affirmative button at the far
- * right, and the cancel button left of it. But the builtin GTK+ dialogs
- * and MessageDialog<!-- -->s do provide an alternative button order,
- * which is more suitable on some platforms, e.g. Windows.
- *
- * Use this function after adding all the buttons to your dialog.
- *
- * @param new_order an array of response ids of the dialog's buttons.
- *
- * @newin{2,6}
- *
- * @deprecated "This should no longer be used."
- */
- void set_alternative_button_order_from_array(const std::vector<int>& new_order);
- _IGNORE(gtk_dialog_set_alternative_button_order_from_array, gtk_dialog_set_alternative_button_order)
-_DEPRECATE_IFDEF_END
-
_WRAP_METHOD(void response(int response_id), gtk_dialog_response)
/** Blocks in a recursive main loop until the dialog either emits the
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index adc61a6..e0ae849 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -85,9 +85,6 @@ public:
_WRAP_METHOD(void set_has_frame(bool setting = true), gtk_entry_set_has_frame)
_WRAP_METHOD(bool get_has_frame() const, gtk_entry_get_has_frame)
- _WRAP_METHOD(void set_inner_border(const Border& border), gtk_entry_set_inner_border, deprecated "Use the
standard border and padding CSS properties instead (through classes like StyleContext and CssProvider).")
- _WRAP_METHOD(Border get_inner_border() const, gtk_entry_get_inner_border, deprecated "Use the standard
border and padding CSS properties instead (through classes like StyleContext and CssProvider).")
-
_WRAP_METHOD(void set_overwrite_mode(bool overwrite = true), gtk_entry_set_overwrite_mode)
_WRAP_METHOD(bool get_overwrite_mode() const, gtk_entry_get_overwrite_mode)
_WRAP_METHOD(void set_max_length(int max), gtk_entry_set_max_length)
@@ -134,8 +131,6 @@ public:
void set_icon_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, EntryIconPosition icon_pos =
ENTRY_ICON_PRIMARY);
_IGNORE(gtk_entry_set_icon_from_pixbuf)
- _WRAP_METHOD(void set_icon_from_stock(const StockID& stock_id{.}, EntryIconPosition icon_pos{.} =
ENTRY_ICON_PRIMARY), gtk_entry_set_icon_from_stock, deprecated "Use set_icon_from_icon_name() instead.")
-
_WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_icon_name)
void set_icon_from_icon_name(const Glib::ustring& icon_name, EntryIconPosition icon_pos =
ENTRY_ICON_PRIMARY);
_IGNORE(gtk_entry_set_icon_from_icon_name)
@@ -145,8 +140,7 @@ public:
_IGNORE(gtk_entry_set_icon_from_gicon)
/** Do not show any icon in the specified position.
- * See set_icon_from_pixbuf(), set_icon_from_stock(), set_icon_from_icon_name(),
- * and set_icon_from_gicon().
+ * See set_icon_from_pixbuf(), set_icon_from_icon_name(), and set_icon_from_gicon().
*
* @param icon_pos The icon position.
*
@@ -157,7 +151,6 @@ public:
_WRAP_METHOD(ImageType get_icon_storage_type(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const,
gtk_entry_get_icon_storage_type)
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY),
gtk_entry_get_icon_pixbuf, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos =
ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_pixbuf, refreturn, constversion)
- _WRAP_METHOD(StockID get_icon_stock(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const,
gtk_entry_get_icon_stock, deprecated "Use get_icon_name() instead.")
_WRAP_METHOD(Glib::ustring get_icon_name(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const,
gtk_entry_get_icon_name)
_WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_icon_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY),
gtk_entry_get_icon_gicon, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_icon_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY)
const, gtk_entry_get_icon_gicon, refreturn, constversion)
@@ -252,15 +245,12 @@ public:
_WRAP_PROPERTY("max-length", int)
_WRAP_PROPERTY("visibility", bool)
_WRAP_PROPERTY("has-frame", bool)
- _WRAP_PROPERTY("inner-border", Border, deprecated "Use the standard border and padding CSS properties
(through objects like StyleContext and CssProvider); the value of this style property is ignored.")
_WRAP_PROPERTY("invisible-char", gunichar)
_WRAP_PROPERTY("invisible-char-set", bool)
_WRAP_PROPERTY("activates-default", bool)
_WRAP_PROPERTY("width-chars", int)
_WRAP_PROPERTY("max-width-chars", int)
_WRAP_PROPERTY("scroll-offset", int)
- _WRAP_PROPERTY("shadow-type", ShadowType,
- deprecated "This property is ignored. Use CSS to determine the style of the border.")
_WRAP_PROPERTY("text", Glib::ustring)
_WRAP_PROPERTY("xalign", float)
_WRAP_PROPERTY("truncate-multiline", bool)
@@ -271,8 +261,6 @@ public:
_WRAP_PROPERTY("progress-pulse-step", double)
_WRAP_PROPERTY("primary-icon-pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
_WRAP_PROPERTY("secondary-icon-pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
- _WRAP_PROPERTY("primary-icon-stock", StockID, deprecated "Use property_primary_icon_name() instead.")
- _WRAP_PROPERTY("secondary-icon-stock", StockID, deprecated "Use property_secondary_icon_name() instead.")
_WRAP_PROPERTY("primary-icon-name", Glib::ustring)
_WRAP_PROPERTY("secondary-icon-name", Glib::ustring)
_WRAP_PROPERTY("primary-icon-gicon", Glib::RefPtr<Gio::Icon>)
diff --git a/gtk/src/enums.ccg b/gtk/src/enums.ccg
index fd22b8a..2373ee4 100644
--- a/gtk/src/enums.ccg
+++ b/gtk/src/enums.ccg
@@ -17,7 +17,6 @@
*/
#include <gtkmm/enums.h>
-#include <gtkmm/settings.h>
// static
GType Glib::Value<Gtk::IconSize>::value_type()
@@ -34,58 +33,6 @@ bool IconSize::lookup(IconSize size, int& width, int& height)
return gtk_icon_size_lookup((GtkIconSize) int(size), &width, &height);
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-// static
-bool IconSize::lookup(IconSize size, int& width, int& height, const Glib::RefPtr<Gtk::Settings>& settings)
-{
- return gtk_icon_size_lookup_for_settings(Glib::unwrap(settings), (GtkIconSize) int(size), &width, &height);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-// static
-IconSize IconSize::register_new(const Glib::ustring& name, int width, int height)
-{
- const int size = gtk_icon_size_register(name.c_str(), width, height);
- return IconSize(size);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-// static
-void IconSize::register_alias(const Glib::ustring& alias, IconSize target)
-{
- gtk_icon_size_register_alias(alias.c_str(), (GtkIconSize) int(target));
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-// static
-IconSize IconSize::from_name(const Glib::ustring& name)
-{
- const int size = gtk_icon_size_from_name(name.c_str());
- return IconSize(size);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-// static
-Glib::ustring IconSize::get_name(IconSize size)
-{
- return gtk_icon_size_get_name((GtkIconSize) int(size));
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
float _gtkmm_align_float_from_enum(Align value)
{
//Choose the float alignment value appropriate for this human-readable enum value:
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 0b0974b..bdc924e 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -29,17 +29,9 @@ _CC_INCLUDE(gtk/gtk.h)
_WRAP_ENUM(AccelFlags, GtkAccelFlags)
_WRAP_ENUM(Align, GtkAlign)
_WRAP_ENUM(ArrowType, GtkArrowType)
-_WRAP_ENUM(AttachOptions, GtkAttachOptions)
_WRAP_ENUM(ButtonBoxStyle, GtkButtonBoxStyle)
_WRAP_ENUM(DeleteType, GtkDeleteType)
_WRAP_ENUM(DirectionType, GtkDirectionType)
-
-//TODO: let _WRAP_ENUM() take a deprecated option.
-/**
- * @deprecated This is not used in the gtkmm API.
- */
-_WRAP_ENUM(ExpanderStyle, GtkExpanderStyle)
-
_WRAP_ENUM(BuiltinIconSize, GtkIconSize)
_WRAP_ENUM(TextDirection, GtkTextDirection)
_WRAP_ENUM(Justification, GtkJustification)
@@ -49,13 +41,10 @@ _WRAP_ENUM(MovementStep, GtkMovementStep)
_WRAP_ENUM(Orientation, GtkOrientation)
_WRAP_ENUM(CornerType, GtkCornerType)
_WRAP_ENUM(PackType, GtkPackType)
-_WRAP_ENUM(PathPriorityType, GtkPathPriorityType)
-_WRAP_ENUM(PathType, GtkPathType)
_WRAP_ENUM(PlacesOpenFlags, GtkPlacesOpenFlags)
_WRAP_ENUM(PolicyType, GtkPolicyType)
_WRAP_ENUM(PositionType, GtkPositionType)
_WRAP_ENUM(ReliefStyle, GtkReliefStyle)
-_WRAP_ENUM(ResizeMode, GtkResizeMode)
_WRAP_ENUM(RevealerTransitionType, GtkRevealerTransitionType)
_WRAP_ENUM(ScrollType, GtkScrollType)
_WRAP_ENUM(SelectionMode, GtkSelectionMode)
@@ -71,7 +60,6 @@ _WRAP_ENUM(SortType, GtkSortType)
_WRAP_ENUM(PageOrientation, GtkPageOrientation)
_WRAP_ENUM(SensitivityType, GtkSensitivityType)
_WRAP_ENUM(SizeRequestMode, GtkSizeRequestMode)
-_WRAP_ENUM(RegionFlags, GtkRegionFlags)
_WRAP_ENUM(JunctionSides, GtkJunctionSides)
_WRAP_ENUM(StateFlags, GtkStateFlags)
_WRAP_ENUM(InputPurpose, GtkInputPurpose)
@@ -118,68 +106,6 @@ public:
* @result true if size was a valid size.
*/
static bool lookup(IconSize size, int& width, int& height);
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Obtains the pixel size of a semantic icon size, possibly modified by user preferences for a particular
- * Gtk::Settings. Normally size would be Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_BUTTON, etc.
- * This function isn't normally needed because Gtk::Widget::render_icon() is the usual way to get an icon
for
- * rendering - then just look at the size of the rendered pixbuf. The rendered pixbuf may not even
correspond
- * to the width/height returned by IconSize::lookup(), because themes are free to render the pixbuf
however they
- * like, including changing the usual size.
- *
- * @param size An icon size.
- * @param width Location to store icon width.
- * @param height Location to store icon height.
- * @param settings A Gtk::Settings object, used to determine which set of user preferences to used.
- * @result true if size was a valid size.
- *
- * @deprecated Use IconSize::lookup() without the @a settings parameter instead.
- * @newin{2,14}
- */
- static bool lookup(IconSize size, int& width, int& height, const Glib::RefPtr<Gtk::Settings>& settings);
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Registers a new icon size, along the same lines as ICON_SIZE_MENU, etc. Returns the integer value for
the size.
- *
- * @param name Name of the icon size.
- * @param width The icon width.
- * @param height The icon height.
- * @result Integer value representing the size.
- * @deprecated Use Gtk::IconTheme instead.
- */
- static IconSize register_new(const Glib::ustring& name, int width, int height);
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Registers @a alias as another name for @a target so calling from_name() with @a alias as argument will
return @a target.
- *
- * @param alias An alias for target.
- * @param target An existing icon size.
- * @deprecated Use Gtk::IconTheme instead.
- */
- static void register_alias(const Glib::ustring& alias, IconSize target);
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Looks up the icon size associated with @a name.
- *
- * @param name the name to look up.
- * @result The icon size with the given name.
- * @deprecated Use Gtk::IconTheme instead.
- */
- static IconSize from_name(const Glib::ustring& name);
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Gets the canonical name of the given icon size.
- *
- * @param size size AnIconSize.
- * @result The name of the given icon size.
- * @deprecated Use Gtk::IconTheme instead.
- */
- static Glib::ustring get_name(IconSize size);
-#endif //GTKMM_DISABLE_DEPRECATED
};
diff --git a/gtk/src/eventbox.hg b/gtk/src/eventbox.hg
index c653f70..61aa36b 100644
--- a/gtk/src/eventbox.hg
+++ b/gtk/src/eventbox.hg
@@ -30,8 +30,8 @@ namespace Gtk
* It will receive any event which is specified
* with set_events().
*
- * This widget is generally used to add Gtk::Tooltip, button presses,
- * and clipping to widgets derived from Gtk::Misc.
+ * The %EventBox widget has its own Gdk::Window. It is useful since it allows
+ * you to catch events for widgets which do not have their own window.
*
* @ingroup Widgets
*/
diff --git a/gtk/src/expander.hg b/gtk/src/expander.hg
index f3854ee..aa8b4ac 100644
--- a/gtk/src/expander.hg
+++ b/gtk/src/expander.hg
@@ -82,9 +82,6 @@ public:
_WRAP_METHOD(void set_expanded(bool expanded = true), gtk_expander_set_expanded)
_WRAP_METHOD(bool get_expanded() const, gtk_expander_get_expanded)
- _WRAP_METHOD(void set_spacing(int spacing), gtk_expander_set_spacing)
- _WRAP_METHOD(int get_spacing() const, gtk_expander_get_spacing)
-
_WRAP_METHOD(void set_label(const Glib::ustring& label), gtk_expander_set_label)
_WRAP_METHOD(Glib::ustring get_label() const, gtk_expander_get_label)
@@ -110,8 +107,6 @@ public:
_WRAP_PROPERTY("label", Glib::ustring)
_WRAP_PROPERTY("use_underline", bool)
_WRAP_PROPERTY("use_markup", bool)
- _WRAP_PROPERTY("spacing", int,
- deprecated "This property is ignored. Use margins on the child instead.")
_WRAP_PROPERTY("label_widget", Widget*)
_WRAP_PROPERTY("label_fill", bool)
_WRAP_PROPERTY("resize-toplevel", bool)
diff --git a/gtk/src/filechooserbutton.ccg b/gtk/src/filechooserbutton.ccg
index 927d007..df63b4f 100644
--- a/gtk/src/filechooserbutton.ccg
+++ b/gtk/src/filechooserbutton.ccg
@@ -27,19 +27,5 @@ FileChooserButton::FileChooserButton(FileChooserAction action)
{
}
-// GtkFileChooserButton:focus-on-click has been removed from gtk+.
-// TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > FileChooserButton::property_focus_on_click()
-{
- return Glib::PropertyProxy< bool >(this, "focus-on-click");
-}
-
-Glib::PropertyProxy_ReadOnly< bool > FileChooserButton::property_focus_on_click() const
-{
- return Glib::PropertyProxy_ReadOnly< bool >(this, "focus-on-click");
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
} // namespace Gtk
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index fec1039..300e518 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -18,9 +18,9 @@
#include <gtkmm/box.h>
#include <gtkmm/filechooserdialog.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/hvbox_p.h)
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/box_p.h)
namespace Gtk
{
@@ -43,10 +43,10 @@ namespace Gtk
* @ingroup Widgets
*/
class FileChooserButton
- : public HBox, //Note: The C object derives from GtkBox.
+ : public Box,
public FileChooser
{
- _CLASS_GTKOBJECT(FileChooserButton, GtkFileChooserButton, GTK_FILE_CHOOSER_BUTTON, Gtk::HBox, GtkHBox)
+ _CLASS_GTKOBJECT(FileChooserButton, GtkFileChooserButton, GTK_FILE_CHOOSER_BUTTON, Gtk::Box, GtkBox)
_IMPLEMENTS_INTERFACE(FileChooser)
public:
@@ -74,38 +74,12 @@ public:
_WRAP_METHOD(int get_width_chars() const, gtk_file_chooser_button_get_width_chars)
_WRAP_METHOD(void set_width_chars(int n_chars), gtk_file_chooser_button_set_width_chars)
- _WRAP_METHOD(bool get_focus_on_click() const, gtk_file_chooser_button_get_focus_on_click,
- deprecated "Use Widget::get_focus_on_click() instead.")
- _WRAP_METHOD(void set_focus_on_click(gboolean focus_on_click = true),
gtk_file_chooser_button_set_focus_on_click,
- deprecated "Use Widget::set_focus_on_click() instead.")
-
//This is a G_SIGNAL_ACTION signal, but it seems to be public API for applications.
//See http://bugzilla.gnome.org/show_bug.cgi?id=353196
_WRAP_SIGNAL(void file_set(), "file-set")
//_WRAP_PROPERTY("dialog", FileChooserDialog*) //construct-only
- // GtkFileChooserButton:focus-on-click has been removed from gtk+.
- // TODO: At ABI-break, remove it from gtkmm.
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Whether the button grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy that allows you to get or set the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy< bool > property_focus_on_click() ;
-
- /** Whether the button grabs focus when it is clicked with the mouse.
- * @deprecated Use Widget::property_focus_on_click() instead.
- *
- * @return A PropertyProxy_ReadOnly that allows you to get the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy_ReadOnly< bool > property_focus_on_click() const;
-#endif // GTKMM_DISABLE_DEPRECATED
- //_WRAP_PROPERTY("focus-on-click", bool, deprecated "Use Widget::property_focus_on_click() instead.")
-
_WRAP_PROPERTY("title", Glib::ustring)
_WRAP_PROPERTY("width-chars", int)
};
diff --git a/gtk/src/filechooserwidget.hg b/gtk/src/filechooserwidget.hg
index 0f08197..17c956b 100644
--- a/gtk/src/filechooserwidget.hg
+++ b/gtk/src/filechooserwidget.hg
@@ -20,12 +20,14 @@
#include <gtkmm/filechooser.h>
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/hvbox_p.h)
+_PINCLUDE(gtkmm/private/box_p.h)
namespace Gtk
{
+//TODO: Derive from the FileChooserEmbed interface when it has been wrapped in gtkmm.
+
/** File chooser widget that can be embedded in other widgets.
*
* FileChooserWidget is a widget suitable for selecting files. It is the main
@@ -36,10 +38,10 @@ namespace Gtk
* @ingroup Widgets
*/
class FileChooserWidget
-: public VBox,
+: public Box,
public FileChooser
{
- _CLASS_GTKOBJECT(FileChooserWidget, GtkFileChooserWidget, GTK_FILE_CHOOSER_WIDGET, Gtk::VBox, GtkVBox)
+ _CLASS_GTKOBJECT(FileChooserWidget, GtkFileChooserWidget, GTK_FILE_CHOOSER_WIDGET, Gtk::Box, GtkBox)
_IMPLEMENTS_INTERFACE(FileChooser)
public:
_CTOR_DEFAULT;
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index ed0a4b6..4e7e7a2 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -14,10 +14,8 @@ gtkmm_files_any_hg = \
aboutdialog.hg \
accelgroup.hg \
accellabel.hg \
- action.hg \
actionable.hg \
actionbar.hg \
- activatable.hg \
adjustment.hg \
appchooser.hg \
appchooserbutton.hg \
@@ -96,7 +94,6 @@ gtkmm_files_any_hg = \
glarea.hg \
grid.hg \
headerbar.hg \
- hvbox.hg \
iconinfo.hg \
icontheme.hg \
iconview.hg \
@@ -119,10 +116,8 @@ gtkmm_files_any_hg = \
menushell.hg \
menutoolbutton.hg \
messagedialog.hg \
- misc.hg \
modelbutton.hg \
notebook.hg \
- offscreenwindow.hg \
orientable.hg \
overlay.hg \
pagesetup.hg \
@@ -220,35 +215,9 @@ gtkmm_files_posix_hg = \
printjob.hg \
printunixdialog.hg
-gtkmm_files_x11_hg = \
- plug.hg \
- socket.hg
+gtkmm_files_x11_hg =
-gtkmm_files_deprecated_hg = \
- actiongroup.hg \
- alignment.hg \
- arrow.hg \
- colorselection.hg \
- fontselection.hg \
- handlebox.hg \
- hvbuttonbox.hg \
- hvpaned.hg \
- hvscale.hg \
- hvscrollbar.hg \
- hvseparator.hg \
- iconfactory.hg \
- iconset.hg \
- iconsource.hg \
- imagemenuitem.hg \
- numerableicon.hg \
- radioaction.hg \
- recentaction.hg \
- statusicon.hg \
- stockitem.hg \
- table.hg \
- tearoffmenuitem.hg \
- toggleaction.hg \
- uimanager.hg
+gtkmm_files_deprecated_hg =
if HOST_WINDOWS_NATIVE
gtkmm_files_arch_hg =
diff --git a/gtk/src/iconinfo.ccg b/gtk/src/iconinfo.ccg
index cfdff73..310b727 100644
--- a/gtk/src/iconinfo.ccg
+++ b/gtk/src/iconinfo.ccg
@@ -60,30 +60,6 @@ IconInfo::IconInfo(const Glib::RefPtr<IconTheme>& icon_theme, const Glib::RefPtr
{
}
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-std::vector<Gdk::Point> IconInfo::get_attach_points() const
-{
- GdkPoint* c_attach_points = nullptr;
- gint n_points = 0;
- gtk_icon_info_get_attach_points (const_cast<GtkIconInfo*>(gobj()), &c_attach_points, &n_points);
-
- if (c_attach_points)
- {
- return Glib::ArrayHandler<Gdk::Point, Gdk::PointTraits>::array_to_vector(c_attach_points, n_points,
Glib::OWNERSHIP_DEEP);
- }
- return std::vector<Gdk::Point> ();
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
-
-_DEPRECATE_IFDEF_START
-IconInfo::operator const void*() const
-{
- return gobj() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
IconInfo::operator bool() const
{
return gobj();
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index 753e95d..fbd0b12 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -35,32 +35,11 @@ class IconTheme;
class IconInfo
{
_CLASS_BOXEDTYPE(IconInfo, GtkIconInfo, NONE, gtk_icon_info_ref, g_object_unref)
- _IGNORE(gtk_icon_info_get_attach_points, gtk_icon_info_copy, gtk_icon_info_free)
public:
IconInfo(const Glib::RefPtr<IconTheme>& icon_theme, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
_IGNORE(gtk_icon_info_new_for_pixbuf)
-_DEPRECATE_IFDEF_START
- /** This typedef is just to make it more obvious that
- * our operator const void* should be used like operator bool().
- *
- * @deprecated Use the explicit operator bool() instead.
- */
- typedef const void* BoolExpr;
-
- /** Tests whether the IconInfo is valid.
- * For instance,
- * @code
- * if(iconinfo)
- * do_something()
- * @endcode
- *
- * @deprecated Use the explicit operator bool() instead.
- */
- operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
/** Tests whether the IconInfo is valid.
*
* @newin{3,22}
@@ -71,10 +50,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(int get_base_scale() const, gtk_icon_info_get_base_scale)
_WRAP_METHOD(Glib::ustring get_filename() const, gtk_icon_info_get_filename)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_builtin_pixbuf(), gtk_icon_info_get_builtin_pixbuf, refreturn,
- deprecated "Use Gtk::IconTheme::add_resource_path() instead of builtin icons.")
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_builtin_pixbuf() const, gtk_icon_info_get_builtin_pixbuf,
refreturn, constversion,
- deprecated "Use Gtk::IconTheme::add_resource_path() instead of builtin icons.")
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> load_icon() const, gtk_icon_info_load_icon, errthrow)
#m4 _CONVERSION(`cairo_surface_t*',`::Cairo::RefPtr< ::Cairo::Surface>',`::Cairo::RefPtr<
::Cairo::Surface>(new Cairo::Surface($3, true /* do not take reference */))')
@@ -84,8 +59,6 @@ _DEPRECATE_IFDEF_END
Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const
Gdk::RGBA& warning_color, const Gdk::RGBA& error_color, bool& was_symbolic) const;
_IGNORE(gtk_icon_info_load_symbolic)
- _IGNORE(gtk_icon_info_load_symbolic_for_style) //deprecated
-
/** Asynchronously load, render and scale an icon previously looked up from the icon theme using
Gtk::IconTheme::lookup_icon().
*
* @param slot A callback slot to call when the request is satisfied.
@@ -153,20 +126,7 @@ _DEPRECATE_IFDEF_END
void load_symbolic_async(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const Gdk::RGBA&
warning_color, const Gdk::RGBA& error_color, const Gio::SlotAsyncReady& slot);
_IGNORE(gtk_icon_info_load_symbolic_async)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> load_symbolic_finish(const Glib::RefPtr<Gio::AsyncResult>& result,
bool& was_symbolic), gtk_icon_info_load_symbolic_finish, errthrow)
-
-
- _WRAP_METHOD(void set_raw_coordinates(bool raw_coordinates = true), gtk_icon_info_set_raw_coordinates,
deprecated "Embedded rectangles and attachment points are deprecated.")
- _WRAP_METHOD(bool get_embedded_rect(Gdk::Rectangle& rectangle) const, gtk_icon_info_get_embedded_rect,
deprecated "Embedded rectangles are deprecated.")
-
-_DEPRECATE_IFDEF_START
- /**
- * @deprecated Attachment points are deprecated.
- */
- std::vector<Gdk::Point> get_attach_points() const;
-_DEPRECATE_IFDEF_END
-
- _WRAP_METHOD(Glib::ustring get_display_name() const, gtk_icon_info_get_display_name, deprecated "Display
names are deprecated.")
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> load_symbolic_finish(const Glib::RefPtr<Gio::AsyncResult>& result,
bool& was_symbolic), gtk_icon_info_load_symbolic_finish, errthrow)
_WRAP_METHOD(bool is_symbolic() const, gtk_icon_info_is_symbolic)
};
diff --git a/gtk/src/icontheme.hg b/gtk/src/icontheme.hg
index a5103ca..e7bdfc3 100644
--- a/gtk/src/icontheme.hg
+++ b/gtk/src/icontheme.hg
@@ -92,7 +92,6 @@ public:
_WRAP_METHOD(Glib::ustring get_example_icon_name() const, gtk_icon_theme_get_example_icon_name)
_WRAP_METHOD(bool rescan_if_needed(), gtk_icon_theme_rescan_if_needed)
- _WRAP_METHOD(static void add_builtin_icon(const Glib::ustring& icon_name, int size, const
Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_icon_theme_add_builtin_icon, deprecated "Use add_resource_path() to
add application-specific icons to the icon theme.")
_WRAP_SIGNAL(void changed(), "changed")
};
diff --git a/gtk/src/image.ccg b/gtk/src/image.ccg
index 344fbaf..4a094d6 100644
--- a/gtk/src/image.ccg
+++ b/gtk/src/image.ccg
@@ -21,55 +21,11 @@
namespace Gtk
{
-#ifndef GTKMM_DISABLE_DEPRECATED
-Image::Image(const Gtk::StockID& stock_id, IconSize size)
-:
- _CONSTRUCT("stock", stock_id.get_c_str(), "icon-size", (GtkIconSize) int(size))
-{}
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-Image::Image(const Glib::RefPtr<IconSet>& icon_set, IconSize size)
-:
- _CONSTRUCT("icon-set", (icon_set ? icon_set->gobj() : nullptr), "icon-size", (GtkIconSize) int(size))
-{}
-#endif //GTKMM_DISABLE_DEPRECATED
-
Image::Image(const Glib::RefPtr<Gdk::PixbufAnimation>& animation)
:
_CONSTRUCT("pixbuf-animation", Glib::unwrap(animation))
{}
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Image::get_stock(Gtk::StockID& stock_id, IconSize& size) const
-{
- char* pStockID = nullptr; // GTK+ iconsistency: although not const, it should not be freed.
- GtkIconSize icon_size = GTK_ICON_SIZE_INVALID;
-
- gtk_image_get_stock(const_cast<GtkImage*>(gobj()), &pStockID, &icon_size);
-
- size = IconSize(static_cast<int>(icon_size));
- stock_id = Gtk::StockID(pStockID); // the StockID ctor checks for 0
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Image::get_icon_set(Glib::RefPtr<IconSet>& icon_set, IconSize& size) const
-{
- GtkIconSet* pIconSet = nullptr;
- GtkIconSize icon_size = GTK_ICON_SIZE_INVALID;
-
- gtk_image_get_icon_set(const_cast<GtkImage*>(gobj()), &pIconSet, &icon_size);
-
- size = IconSize(static_cast<int>(icon_size));
- icon_set = Glib::wrap(pIconSet, true); //true = take_copy.
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif //GTKMM_DISABLE_DEPRECATED
-
Glib::ustring Image::get_icon_name() const
{
const gchar* pchIconName = nullptr;
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index 3f7f70e..fd9539c 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -16,13 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gtkmm/misc.h>
-#include <gtkmm/iconset.h>
+#include <gtkmm/widget.h>
#include <gdkmm/pixbufanimation.h>
#include <giomm/icon.h>
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/misc_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
namespace Gtk
{
@@ -37,9 +36,6 @@ _WRAP_ENUM(ImageType, GtkImageType)
* displayed as an image; most typically, you would load a Gdk::Pixbuf ("pixel
* buffer") from a file, and then display that.
*
- * Gtk::Image is a subclass of Gtk::Misc, which implies that you can align it
- * (center, left, right) and add padding to it, using Gtk::Misc methods.
- *
* Gtk::Image is a "no window" widget (has no Gdk::Window of its own), so by
* default does not receive events. If you want to receive events on the
* image, such as button clicks, place the image inside a Gtk::EventBox, then
@@ -50,10 +46,9 @@ _WRAP_ENUM(ImageType, GtkImageType)
*
* @ingroup Widgets
*/
-class Image : public Misc
+class Image : public Widget
{
- _CLASS_GTKOBJECT(Image,GtkImage,GTK_IMAGE,Gtk::Misc,GtkMisc)
- _IGNORE(gtk_image_get_stock, gtk_image_get_icon_set)
+ _CLASS_GTKOBJECT(Image,GtkImage,GTK_IMAGE,Gtk::Widget,GtkWidget)
public:
_CTOR_DEFAULT
@@ -75,37 +70,16 @@ public:
* Should you want that, you should use the default constructor and set_from_icon_name().
*/
_WRAP_CTOR(Image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_image_new_from_pixbuf)
- _IGNORE(gtk_image_new_from_icon_set) // deprecated since 3.10
//We don't wrap gtk_image_new_from_icon_name() to avoid a clash with the from-filename constructor.
//But we do wrap gtk_image_set_from_icon_name()
_IGNORE(gtk_image_new_from_icon_name)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates am Image displaying a stock icon.
- * Sample stock icon identifiers are Gtk::Stock::OPEN, Gtk::Stock::EXIT. Sample stock sizes are
Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_SMALL_TOOLBAR.
- * If the stock icon name isn't known, a "broken image" icon will be displayed instead.
- * You can register your own stock icon names - see Gtk::IconFactory::add().
- * @param stock_id A stock icon.
- * @param size A stock icon size.
- * @deprecated Use the default constructor and set_from_icon_name() instead.
- */
- Image(const Gtk::StockID& stock_id, IconSize size);
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** @deprecated Use the default constructor and set_from_icon_name() instead.
- */
- Image(const Glib::RefPtr<IconSet>& icon_set, IconSize size);
-#endif //GTKMM_DISABLE_DEPRECATED
-
explicit Image(const Glib::RefPtr<Gdk::PixbufAnimation>& animation);
_WRAP_METHOD(void set(const std::string& filename), gtk_image_set_from_file)
_WRAP_METHOD(void set_from_resource(const std::string& resource_path), gtk_image_set_from_resource)
_WRAP_METHOD(void set(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_image_set_from_pixbuf)
- _WRAP_METHOD(void set(const Gtk::StockID& stock_id, IconSize size), gtk_image_set_from_stock, deprecated
"Use set_from_icon_name() instead.")
- _WRAP_METHOD(void set(const Glib::RefPtr<IconSet>& icon_set, IconSize size), gtk_image_set_from_icon_set,
deprecated "Use set_from_icon_name() instead.")
_WRAP_METHOD(void set(const Glib::RefPtr<Gdk::PixbufAnimation>& animation), gtk_image_set_from_animation)
_WRAP_METHOD(void set(const Glib::RefPtr<const Gio::Icon>& icon, IconSize size), gtk_image_set_from_gicon)
@@ -122,18 +96,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(), gtk_image_get_pixbuf, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const, gtk_image_get_pixbuf, refreturn,
constversion)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** @deprecated Use get_icon_name() instead.
- */
- void get_stock(Gtk::StockID& stock_id, IconSize& size) const;
-#endif //GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** @deprecated Use get_icon_name() instead.
- */
- void get_icon_set(Glib::RefPtr<IconSet>& icon_set, IconSize& size) const;
-#endif //GTKMM_DISABLE_DEPRECATED
-
_WRAP_METHOD(Glib::RefPtr<Gdk::PixbufAnimation> get_animation(), gtk_image_get_animation, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::PixbufAnimation> get_animation() const, gtk_image_get_animation,
refreturn, constversion)
@@ -167,8 +129,6 @@ public:
_WRAP_PROPERTY("pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
_WRAP_PROPERTY("file", Glib::ustring)
- _WRAP_PROPERTY("stock", Glib::ustring, deprecated "Use property_icon_name() instead.")
- _WRAP_PROPERTY("icon-set", Glib::RefPtr<IconSet>, deprecated "Use property_icon_name() instead.")
_WRAP_PROPERTY("icon-size", int)
_WRAP_PROPERTY("pixel-size", int)
_WRAP_PROPERTY("pixbuf-animation", Glib::RefPtr<Gdk::PixbufAnimation>)
diff --git a/gtk/src/infobar.hg b/gtk/src/infobar.hg
index 1febc54..5dbe97e 100644
--- a/gtk/src/infobar.hg
+++ b/gtk/src/infobar.hg
@@ -20,7 +20,7 @@
#include <gtkmm/enums.h>
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/hvbox_p.h)
+_PINCLUDE(gtkmm/private/box_p.h)
namespace Gtk
@@ -47,9 +47,9 @@ namespace Gtk
*
* @ingroup Widgets
*/
-class InfoBar : public HBox //Note: The C object derives from GtkBox.
+class InfoBar : public Box
{
- _CLASS_GTKOBJECT(InfoBar, GtkInfoBar, GTK_INFO_BAR, Gtk::HBox, GtkHBox)
+ _CLASS_GTKOBJECT(InfoBar, GtkInfoBar, GTK_INFO_BAR, Gtk::Box, GtkBox)
public:
_CTOR_DEFAULT
@@ -67,7 +67,6 @@ public:
_WRAP_METHOD(void add_action_widget(Widget& child, int response_id), gtk_info_bar_add_action_widget)
_WRAP_METHOD(Button* add_button(const Glib::ustring& button_text, int response_id),
gtk_info_bar_add_button)
- _WRAP_METHOD(Button* add_button(const Gtk::StockID& stock_id, int response_id), gtk_info_bar_add_button,
deprecated "Use the add_button() that takes a Glib::ustring instead.")
_IGNORE(gtk_info_bar_add_buttons)
_WRAP_METHOD(void set_response_sensitive(int response_id, bool setting = true),
gtk_info_bar_set_response_sensitive)
diff --git a/gtk/src/label.ccg b/gtk/src/label.ccg
index 55f9772..ee73eba 100644
--- a/gtk/src/label.ccg
+++ b/gtk/src/label.ccg
@@ -31,15 +31,6 @@ Label::Label(const Glib::ustring& label, bool mnemonic)
_CONSTRUCT("label", label.c_str(), "use_underline", gboolean(mnemonic))
{}
-_DEPRECATE_IFDEF_START
-Label::Label(const Glib::ustring& label, float xalign, float yalign, bool mnemonic)
-:
- _CONSTRUCT("label", label.c_str(), "use_underline", gboolean(mnemonic))
-{
- set_alignment(xalign, yalign);
-}
-_DEPRECATE_IFDEF_END
-
Label::Label(const Glib::ustring& label, Align xalign, Align yalign, bool mnemonic)
:
_CONSTRUCT("label", label.c_str(), "use_underline", gboolean(mnemonic))
@@ -54,4 +45,3 @@ void Label::select_region(int start_offset)
}
} // namespace Gtk
-
diff --git a/gtk/src/label.hg b/gtk/src/label.hg
index 4e8dbb3..4e224ff 100644
--- a/gtk/src/label.hg
+++ b/gtk/src/label.hg
@@ -16,13 +16,12 @@
*/
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/misc_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
_PINCLUDE(gtk/gtk.h)
-#include <gtkmm/misc.h>
+#include <gtkmm/widget.h>
#include <pangomm/attrlist.h>
-
namespace Gtk
{
@@ -37,31 +36,13 @@ class Menu;
*
* @ingroup Widgets
*/
-class Label : public Misc
+class Label : public Widget
{
- _CLASS_GTKOBJECT(Label, GtkLabel, GTK_LABEL, Gtk::Misc,GtkMisc)
+ _CLASS_GTKOBJECT(Label, GtkLabel, GTK_LABEL, Gtk::Widget, GtkWidget)
public:
Label();
explicit Label(const Glib::ustring& label, bool mnemonic = false);
-_DEPRECATE_IFDEF_START
- /** This constructor is a shortcut for often used code
- * when you want to create a label with alignment different
- * than default one.
- * @code
- * Gtk::Label label(text, x, y, mnemonic);
- * @endcode
- * is equivalent to:
- * @code
- * Gtk::Label label(text, mnemonic);
- * label.set_alignment(x, y);
- * @endcode
- *
- * @deprecated Use another constructor.
- */
- Label(const Glib::ustring& label, float xalign, float yalign, bool mnemonic = false);
-_DEPRECATE_IFDEF_END
-
/** This constructor is a shortcut for often used code
* when you want to create a label with alignment different
* than default one.
diff --git a/gtk/src/layout.hg b/gtk/src/layout.hg
index d154206..e77789c 100644
--- a/gtk/src/layout.hg
+++ b/gtk/src/layout.hg
@@ -57,9 +57,6 @@ public:
_WRAP_METHOD(void set_size(guint width, guint height), gtk_layout_set_size)
_WRAP_METHOD(void get_size(guint& width, guint& height) const, gtk_layout_get_size)
- _IGNORE(gtk_layout_get_hadjustment, gtk_layout_set_hadjustment,
- gtk_layout_get_vadjustment, gtk_layout_set_vadjustment) //deprecated
-
_WRAP_PROPERTY("width", guint)
_WRAP_PROPERTY("height", guint)
diff --git a/gtk/src/main.ccg b/gtk/src/main.ccg
index 5b266a5..797b388 100644
--- a/gtk/src/main.ccg
+++ b/gtk/src/main.ccg
@@ -29,220 +29,13 @@
#include <gdkmm/wrap_init.h>
#include <gtkmm/wrap_init.h>
-_DEPRECATE_IFDEF_START
-
-namespace
-{
-
-/* This class tells sigc++ how to break GTK+ main signal connections. Since
- * the gtk_*_remove() functions have the same signature, all main signals can
- * be handled by a single class. Special handling is needed for signals that
- * don't support destroy notification; see the comment on connection_list_.
- */
-class GtkMainConnectionNode
-{
-public:
- // A function taking a connection id, e.g. gtk_timeout_remove().
- typedef void (*RemoveFunc) (guint);
-
- explicit GtkMainConnectionNode(const sigc::slot_base& slot);
-
- static void* notify(void* data);
- static void destroy_notify_handler(void* data);
-
- // Call this after installing the GTK+ callback.
- void install(guint conn_id, RemoveFunc remove_func, bool has_destroy_notify);
-
- inline sigc::slot_base* get_slot();
-
- static bool list_remove(GtkMainConnectionNode* conn_node);
- static void list_notify_all();
-
-private:
- sigc::slot_base slot_;
- static GSList* connection_list_;
-
- guint conn_id_;
- RemoveFunc remove_func_;
- bool has_destroy_notify_;
- bool destroyed_;
-};
-
-
-/* The global connection_list_ is needed to deal with GTK+ main signals
- * that don't support destroy notification. This applies only to
- * gtk_key_snooper_install() and gtk_init_add().
- *
- * The list is static and not a member of Gtk::Main, in order to support
- * connection to Gtk::Main::signal_run() before Gtk::Main is instantiated.
- * Thus, it's possible to install initialization hooks in global constructors,
- * for instance.
- */
-// static
-GSList* GtkMainConnectionNode::connection_list_ = nullptr;
-
-GtkMainConnectionNode::GtkMainConnectionNode(const sigc::slot_base& slot)
-:
- slot_(slot),
- conn_id_ (0),
- remove_func_ (nullptr),
- has_destroy_notify_ (false),
- destroyed_ (false)
-{
- slot_.set_parent(this, &GtkMainConnectionNode::notify);
-}
-
-//static:
-void* GtkMainConnectionNode::notify(void* data)
-{
- // notification from the sigc++ side ...
-
- const auto self = static_cast<GtkMainConnectionNode*>(data);
-
- // this call might be triggered from destroy_notify_handler().
- if(!self->destroyed_)
- {
- // during (*remove_func_)() destroy_notify_handler() might get called.
- // This must not lead to the destruction of the object!
- self->destroyed_ = true;
-
- // disconnect from the gtk+ side.
- (*(self->remove_func_))(self->conn_id_);
-
- // remove self from global list.
- if (!self->has_destroy_notify_)
- list_remove(self);
-
- // destruction of slot_ notifies all objects referring to it.
- delete self;
- }
-
- return nullptr;
-}
-
-// static
-void GtkMainConnectionNode::destroy_notify_handler(void* data)
-{
- // notification from the gtk+ side ...
-
- const auto self = static_cast<GtkMainConnectionNode*>(data);
-
- // this call might be triggered from notify().
- if(!self->destroyed_)
- {
- self->destroyed_ = true;
-
- // The GTK+ side is disconnected now, thus the ID is no longer valid.
- self->conn_id_ = 0;
-
- // remove self from global list.
- if (!self->has_destroy_notify_)
- list_remove(self);
-
- // destruction of slot_ notifies all objects referring to it.
- delete self;
- }
-}
-
-void GtkMainConnectionNode::install(
- guint conn_id, GtkMainConnectionNode::RemoveFunc remove_func, bool has_destroy_notify)
-{
- conn_id_ = conn_id;
- remove_func_ = remove_func;
- has_destroy_notify_ = has_destroy_notify;
-
- if (!has_destroy_notify_)
- connection_list_ = g_slist_prepend(connection_list_, this);
-}
-
-inline
-sigc::slot_base* GtkMainConnectionNode::get_slot()
-{
- return &slot_;
-}
-
-// static
-bool GtkMainConnectionNode::list_remove(GtkMainConnectionNode* conn_node)
-{
- // The conn_node pointer is only valid if we still hold
- // a reference of the ConnectionNode in our global list.
- //
- if(GSList *const link = g_slist_find(connection_list_, conn_node))
- {
- connection_list_ = g_slist_delete_link(connection_list_, link);
- return true;
- }
-
- return false;
-}
-
-/* Cleanup function to be called by the Gtk::Main destructor. The elements
- * are removed prior to notification, in order to avoid invalid elements in
- * the container.
- */
-// static
-void GtkMainConnectionNode::list_notify_all()
-{
- while(connection_list_ != nullptr)
- {
- GtkMainConnectionNode *const conn_node =
- static_cast<GtkMainConnectionNode*>(connection_list_->data);
-
- connection_list_ = g_slist_delete_link(connection_list_, connection_list_);
-
- // no need to search the list in notify().
- conn_node->has_destroy_notify_ = true;
-
- // conn_node gets destroyed from notify().
- notify(conn_node);
- }
-}
-
-} // anonymous namespace
-
-_DEPRECATE_IFDEF_END
-
-
namespace Gtk
{
_DEPRECATE_IFDEF_START
-/**** Gtk::KeySnooperSig ***************************************************/
-
-sigc::connection KeySnooperSig::connect(const KeySnooperSig::SlotType& slot)
-{
- const auto conn_node = new GtkMainConnectionNode(slot);
- const sigc::connection connection(*conn_node->get_slot());
-
- const guint conn_id = gtk_key_snooper_install(&KeySnooperSig::gtk_callback, conn_node);
-
- conn_node->install(conn_id, >k_key_snooper_remove, false);
- return connection;
-}
-
-// static
-gint KeySnooperSig::gtk_callback(GtkWidget* widget, GdkEventKey* event, gpointer data)
-{
- try
- {
- // Recreate the specific SlotType from the generic slot node.
- auto conn_node = static_cast<GtkMainConnectionNode*>(data);
- auto pSlot = static_cast<SlotType*>(conn_node->get_slot());
- return (*pSlot)(Glib::wrap(widget), event);
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
-
- return 0;
-}
-
/**** Gtk::Main -- static data *********************************************/
-KeySnooperSig Main::signal_key_snooper_;
-
Main* Main::instance_ = nullptr;
/**** Gtk::Main -- construction/destruction ********************************/
@@ -274,7 +67,6 @@ Main::~Main()
if(instance_ == this)
{
instance_ = nullptr;
- GtkMainConnectionNode::list_notify_all();
// Release the gtkmm type registration tables,
// allowing Main to be instantiated again:
@@ -406,14 +198,6 @@ bool Main::events_pending()
_DEPRECATE_IFDEF_START
-/**** Gtk::Main -- static signal accessors *********************************/
-
-KeySnooperSig& Main::signal_key_snooper()
-{
- return signal_key_snooper_;
-}
-
-
/**** Gtk::Main -- protected virtuals **************************************/
void Main::run_impl()
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index 5622887..cbd163d 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -33,36 +33,10 @@ _DEFS(gtkmm,gtk)
namespace Gtk
{
-_DEPRECATE_IFDEF_START
-
-class Widget;
class Window;
//**********************************************************************
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-//Actually, I'd like to just keep these out of the alphabetical list. murrayc.
-
-
-/// KeySnooper Signal Class (internal)
-class KeySnooperSig
-{
-public:
- typedef sigc::slot<int, Widget*, GdkEventKey*> SlotType;
-
- sigc::connection connect(const SlotType& slot);
-
-protected:
- static int gtk_callback(GtkWidget* widget, GdkEventKey* event, gpointer data);
-};
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
-_DEPRECATE_IFDEF_END
-
-
-//**********************************************************************
-
/** Main application class.
* Every application must have one of these objects.
* It may not be global and must be the first gtkmm object created.
@@ -247,23 +221,6 @@ _DEPRECATE_IFDEF_END
*/
static bool events_pending();
-_DEPRECATE_IFDEF_START
-
- /** KeySnooper signal
- * Allows you to channel keypresses to a signal handler
- * without registering with the widget.
- *
- * @return KeySnooperSig A Signal to which you can connect a sigc::slot< int, Widget *, GdkEventKey * >
- *
- * It is the responsibility of the snooper to pass the keypress
- * to the widget, however, care must be taken that the keypress is
- * not passed twice.
- *
- * @deprecated Key snooping should not be done. Events should be handled by widgets.
- */
- static KeySnooperSig& signal_key_snooper();
-_DEPRECATE_IFDEF_END
-
/** Initialize the table of wrap_new functions.
* This doesn't need an instance of Gtk::Main.
* This would usually only be used by the init() methods of libraries that depend on gtkmm.
@@ -286,9 +243,6 @@ _DEPRECATE_IFDEF_START
// Signal handlers:
virtual void on_window_hide();
- // Signal proxies:
- static KeySnooperSig signal_key_snooper_;
-
private:
static Main* instance_;
_DEPRECATE_IFDEF_END
diff --git a/gtk/src/menu.ccg b/gtk/src/menu.ccg
index 0c26926..93a5fd2 100644
--- a/gtk/src/menu.ccg
+++ b/gtk/src/menu.ccg
@@ -110,15 +110,6 @@ void Menu::unset_accel_group()
gtk_menu_set_accel_group(gobj(), nullptr);
}
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Menu::unset_title()
-{
- gtk_menu_set_title(gobj(), nullptr);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
-
void Menu::attach_to_widget(Widget& attach_widget)
{
gtk_menu_attach_to_widget(gobj(), (attach_widget).gobj(), nullptr /* allowed by the C docs. */);
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 2ca286f..7271605 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -121,16 +121,6 @@ public:
_WRAP_METHOD(Widget* get_attach_widget(), gtk_menu_get_attach_widget)
_WRAP_METHOD(const Widget* get_attach_widget() const, gtk_menu_get_attach_widget, constversion)
- _WRAP_METHOD(void set_tearoff_state(bool torn_off = true), gtk_menu_set_tearoff_state, deprecated "No
replacement available.")
- _WRAP_METHOD(bool get_tearoff_state() const, gtk_menu_get_tearoff_state, deprecated "No replacement
available.")
-
- _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_menu_set_title, deprecated "No replacement
available.")
-_DEPRECATE_IFDEF_START
- /** @deprecated No replacement available.
- */
- void unset_title();
-_DEPRECATE_IFDEF_END
- _WRAP_METHOD(Glib::ustring get_title() const, gtk_menu_get_title, deprecated "No replacement available.")
_WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_menu_set_screen)
_WRAP_METHOD(void attach(Gtk::Widget& child, guint left_attach, guint right_attach, guint top_attach,
guint bottom_attach), gtk_menu_attach)
@@ -164,8 +154,6 @@ _DEPRECATE_IFDEF_END
_WRAP_PROPERTY("accel-group", Glib::RefPtr<AccelGroup>)
_WRAP_PROPERTY("accel-path", Glib::ustring)
_WRAP_PROPERTY("attach-widget", Widget*)
- _WRAP_PROPERTY("tearoff-title", Glib::ustring, deprecated "No replacement available.")
- _WRAP_PROPERTY("tearoff-state", bool, deprecated "No replacement available.")
_WRAP_PROPERTY("monitor", int)
_WRAP_PROPERTY("reserve-toggle-size", bool)
_WRAP_PROPERTY("anchor-hints", Gdk::AnchorHints)
diff --git a/gtk/src/menuitem.ccg b/gtk/src/menuitem.ccg
index 59ed513..f1592e3 100644
--- a/gtk/src/menuitem.ccg
+++ b/gtk/src/menuitem.ccg
@@ -18,12 +18,12 @@
#include <gtk/gtk.h>
#include <gtkmm/label.h>
-#include <gtkmm/misc.h>
#include <gtkmm/menu.h>
#include <gtkmm/box.h>
#include <gtkmm/window.h>
#include <gtkmm/menubar.h>
#include <gtkmm/accelmap.h>
+#include <gtkmm/accelgroup.h>
// gtk_menu_item_(de)select are just a wrapper for gtk_item_(de)select
// and defined in Gtk_Item, so they do not be redefined here
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index 0699cfb..9894e3a 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -21,15 +21,14 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/bin.h>
#include <gtkmm/accelkey.h>
#include <gtkmm/accellabel.h>
-#include <gtkmm/activatable.h>
+#include <gtkmm/actionable.h>
+
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
namespace Gtk
{
-//TODO: Derive from (and implement) Actionable when we can break ABI.
-
class Menu;
namespace Menu_Helpers { class Element; }
@@ -41,10 +40,10 @@ namespace Menu_Helpers { class Element; }
*/
class MenuItem
: public Bin,
- public Activatable
+ public Actionable
{
_CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Bin,GtkBin)
- _IMPLEMENTS_INTERFACE(Activatable)
+ _IMPLEMENTS_INTERFACE(Actionable)
public:
/// Create an empty menu item
_CTOR_DEFAULT
@@ -71,9 +70,6 @@ public:
_WRAP_METHOD(void toggle_size_request(int& requisition), gtk_menu_item_toggle_size_request)
_WRAP_METHOD(void toggle_size_allocate(int allocation), gtk_menu_item_toggle_size_allocate)
- _WRAP_METHOD(void set_right_justified(bool right_justified = true), gtk_menu_item_set_right_justified,
deprecated "If you insist on using it, use Widget::set_hexpand() and Widget::set_halign().")
- _WRAP_METHOD(bool get_right_justified() const, gtk_menu_item_get_right_justified, deprecated "See
set_right_justified().")
-
_WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_item_set_accel_path)
void unset_accel_path();
_WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_item_get_accel_path)
@@ -96,9 +92,6 @@ public:
void accelerate(Window& window);
- //TODO: Deprecate the C property once GTK+ 3.5 has begun. It seems to have been forgotten.
- _WRAP_PROPERTY("right-justified", bool, deprecated "See set_right_justified.")
-
_WRAP_PROPERTY("submenu", Gtk::Menu*)
_WRAP_PROPERTY("accel-path", Glib::ustring)
_WRAP_PROPERTY("label", Glib::ustring)
diff --git a/gtk/src/menutoolbutton.ccg b/gtk/src/menutoolbutton.ccg
index c43eeb6..11ec8ff 100644
--- a/gtk/src/menutoolbutton.ccg
+++ b/gtk/src/menutoolbutton.ccg
@@ -21,16 +21,6 @@
namespace Gtk
{
-#ifndef GTKMM_DISABLE_DEPRECATED
-MenuToolButton::MenuToolButton(const Gtk::StockID& stock_id)
-:
- // Mark this class as non-derived to allow C++ vfuncs to be skipped.
- Glib::ObjectBase(nullptr),
- Gtk::ToolButton(Glib::ConstructParams(menutoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(),
nullptr))
-{
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
MenuToolButton::MenuToolButton(const Glib::ustring& label)
:
Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index f00e791..58b5dd5 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -41,20 +41,6 @@ public:
*/
_CTOR_DEFAULT()
- // _WRAP_CTOR does not take a 'deprecated' parameter.
- // _WRAP_CTOR(MenuToolButton(const Gtk::StockID& stock_id), gtk_toggle_tool_button_new_from_stock)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new MenuToolButton from a StockID.
- *
- * The MenuToolButton will be created according to the @a stock_id properties.
- *
- * @param stock_id The StockID which determines the look of the MenuToolButton.
- * @deprecated Use one of the other constructors instead.
- */
- explicit MenuToolButton(const Gtk::StockID& stock_id);
- _IGNORE(gtk_menu_tool_button_new_from_stock)
-#endif // GTKMM_DISABLE_DEPRECATED
-
/** Creates a new MenuToolButton with a label.
*
* The MenuToolButton will have the label @a label.
diff --git a/gtk/src/messagedialog.hg b/gtk/src/messagedialog.hg
index a748e97..c0315d1 100644
--- a/gtk/src/messagedialog.hg
+++ b/gtk/src/messagedialog.hg
@@ -51,10 +51,6 @@ public:
MessageDialog(Gtk::Window& parent, const Glib::ustring& message, bool use_markup = false, MessageType type
= MESSAGE_INFO, ButtonsType buttons = BUTTONS_OK, bool modal = false);
_IGNORE(gtk_message_dialog_new, gtk_message_dialog_new_with_markup)
- _WRAP_METHOD(void set_image(Widget& image), gtk_message_dialog_set_image, deprecated "Use Dialog to create
dialogs with images.")
- _WRAP_METHOD(Widget* get_image(), gtk_message_dialog_get_image, deprecated "Use Dialog for dialogs with
images.")
- _WRAP_METHOD(const Widget* get_image() const, gtk_message_dialog_get_image, constversion, "Use Dialog for
dialogs with images.")
-
_IGNORE(gtk_message_dialog_set_markup)
/** Sets the primary text of the message dialog.
@@ -85,7 +81,6 @@ public:
_WRAP_PROPERTY("use-markup", bool)
_WRAP_PROPERTY("secondary-text", Glib::ustring)
_WRAP_PROPERTY("secondary-use-markup", bool)
- _WRAP_PROPERTY("image", Widget*, deprecated "Use Dialog to create dialogs with images.")
_WRAP_PROPERTY("message-area", Box*)
};
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index c56d8f0..748f435 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -107,9 +107,6 @@ public:
_WRAP_METHOD(void set_scrollable(bool scrollable = true), gtk_notebook_set_scrollable)
_WRAP_METHOD(bool get_scrollable() const, gtk_notebook_get_scrollable)
- _WRAP_METHOD(guint16 get_tab_hborder() const, gtk_notebook_get_tab_hborder, deprecated "This method now
returns zero.")
- _WRAP_METHOD(guint16 get_tab_vborder() const, gtk_notebook_get_tab_vborder, deprecated "This method now
returns zero.")
-
_WRAP_METHOD(void popup_enable(), gtk_notebook_popup_enable)
_WRAP_METHOD(void popup_disable(), gtk_notebook_popup_disable)
diff --git a/gtk/src/paned.ccg b/gtk/src/paned.ccg
index 37e0524..47c0ea5 100644
--- a/gtk/src/paned.ccg
+++ b/gtk/src/paned.ccg
@@ -20,22 +20,4 @@
namespace Gtk
{
-
-void Paned::pack1(Widget& child, AttachOptions options)
-{
- const gboolean resize = ((options & EXPAND) != 0);
- const gboolean shrink = ((options & SHRINK) != 0);
-
- gtk_paned_pack1(gobj(), child.gobj(), resize, shrink);
-}
-
-void Paned::pack2(Widget& child, AttachOptions options)
-{
- const gboolean resize = ((options & EXPAND) != 0);
- const gboolean shrink = ((options & SHRINK) != 0);
-
- gtk_paned_pack2(gobj(), child.gobj(), resize, shrink);
-}
-
} // namespace Gtk
-
diff --git a/gtk/src/paned.hg b/gtk/src/paned.hg
index 3cf1d55..b1ffc85 100644
--- a/gtk/src/paned.hg
+++ b/gtk/src/paned.hg
@@ -74,10 +74,8 @@ public:
_WRAP_METHOD(void add2(Widget& child), gtk_paned_add2)
_WRAP_METHOD(void pack1(Widget& child, bool resize, bool shrink), gtk_paned_pack1)
- void pack1(Widget& child, AttachOptions options = Gtk::EXPAND);
_WRAP_METHOD(void pack2(Widget& child, bool resize, bool shrink), gtk_paned_pack2)
- void pack2(Widget& child, AttachOptions options = Gtk::EXPAND);
_WRAP_METHOD(int get_position() const, gtk_paned_get_position)
_WRAP_METHOD(void set_position(int position), gtk_paned_set_position)
@@ -114,8 +112,3 @@ public:
};
} // namespace Gtk
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvpaned.h>
diff --git a/gtk/src/placessidebar.hg b/gtk/src/placessidebar.hg
index e9291e2..aca0165 100644
--- a/gtk/src/placessidebar.hg
+++ b/gtk/src/placessidebar.hg
@@ -101,11 +101,6 @@ public:
// get_nth_bookmark returns a new Gio::File; modifiying the returned value does not modify the places
sidebar
_WRAP_METHOD(Glib::RefPtr<Gio::File> get_nth_bookmark(int n) const, gtk_places_sidebar_get_nth_bookmark)
- _WRAP_METHOD(void set_show_connect_to_server(bool show_connect_to_server = true),
gtk_places_sidebar_set_show_connect_to_server,
- deprecated "It is recommended to group this functionality with the drives and network location under the
new 'Other Location' item.")
- _WRAP_METHOD(bool get_show_connect_to_server() const, gtk_places_sidebar_get_show_connect_to_server,
- deprecated "It is recommended to group this functionality with the drives and network location under the
new 'Other Location' item.")
-
_WRAP_METHOD(void set_local_only(bool local_only = true), gtk_places_sidebar_set_local_only)
_WRAP_METHOD(bool get_local_only() const, gtk_places_sidebar_get_local_only)
@@ -141,12 +136,8 @@ public:
#m4 _CONVERSION(`GVolume*',`const Glib::RefPtr<Gio::Volume>&', `Glib::wrap($3, true)')
_WRAP_SIGNAL(void populate_popup(Menu* menu, const Glib::RefPtr<Gio::File>& selected_item, const
Glib::RefPtr<Gio::Volume>& selected_volume), "populate_popup", no_default_handler)
- _WRAP_SIGNAL(void show_connect_to_server(), "show_connect_to_server", no_default_handler,
- deprecated "Use signal_show_other_locations() to connect to network servers.")
_WRAP_SIGNAL(void show_error_message(const Glib::ustring& primary, const Glib::ustring& secondary),
"show_error_message", no_default_handler)
_WRAP_SIGNAL(void show_enter_location(), "show_enter_location", no_default_handler)
- _WRAP_SIGNAL(void show_other_locations(), "show_other_locations", no_default_handler,
- deprecated "Use signal_show_other_locations_with_flags() instead.")
_WRAP_SIGNAL(void show_other_locations_with_flags(PlacesOpenFlags open_flags),
"show_other_locations_with_flags", no_default_handler)
#m4 _CONVERSION(`GMountOperation*',`const Glib::RefPtr<Gio::MountOperation>&',`Glib::wrap($3, true)')
@@ -156,7 +147,6 @@ public:
_WRAP_PROPERTY("local-only", bool)
_WRAP_PROPERTY("location", Glib::RefPtr<Gio::File>)
_WRAP_PROPERTY("open-flags", PlacesOpenFlags)
- _WRAP_PROPERTY("show-connect-to-server", bool, deprecated "Use property_show_other_locations() instead.")
_WRAP_PROPERTY("show-desktop", bool)
_WRAP_PROPERTY("show-enter-location", bool)
_WRAP_PROPERTY("show-recent", bool)
diff --git a/gtk/src/popover.hg b/gtk/src/popover.hg
index 6162328..e27154d 100644
--- a/gtk/src/popover.hg
+++ b/gtk/src/popover.hg
@@ -120,9 +120,6 @@ public:
_WRAP_METHOD(void bind_model(const Glib::RefPtr<Gio::MenuModel>& model, const Glib::ustring&
action_namespace{?}), gtk_popover_bind_model)
- _WRAP_METHOD(void set_transitions_enabled(bool transitions_enabled = true),
gtk_popover_set_transitions_enabled, deprecated "You can show or hide the popover without transitions using
show() and hide(), or with transitions using popup() and popdown().")
- _WRAP_METHOD(bool get_transitions_enabled() const, gtk_popover_get_transitions_enabled, deprecated "See
set_transitions_enabled().")
-
_WRAP_METHOD(void set_default_widget(Widget& widget), gtk_popover_set_default_widget)
_WRAP_METHOD(Widget* get_default_widget(), gtk_popover_get_default_widget)
@@ -138,7 +135,6 @@ public:
_WRAP_PROPERTY("pointing-to", Gdk::Rectangle)
_WRAP_PROPERTY("position", PositionType)
_WRAP_PROPERTY("modal", bool)
- _WRAP_PROPERTY("transitions-enabled", bool, deprecated "See set_transitions_enabled()")
_WRAP_PROPERTY("constrain-to", PopoverConstraint)
_WRAP_SIGNAL(void closed(), "closed")
diff --git a/gtk/src/radiomenuitem.ccg b/gtk/src/radiomenuitem.ccg
index f7d3f70..9e288f4 100644
--- a/gtk/src/radiomenuitem.ccg
+++ b/gtk/src/radiomenuitem.ccg
@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gtkmm/misc.h>
#include <gtkmm/label.h>
#include <gtk/gtk.h>
diff --git a/gtk/src/radiotoolbutton.ccg b/gtk/src/radiotoolbutton.ccg
index eb5db51..33dddc8 100644
--- a/gtk/src/radiotoolbutton.ccg
+++ b/gtk/src/radiotoolbutton.ccg
@@ -37,29 +37,6 @@ RadioToolButton::RadioToolButton(Group& group, const Glib::ustring& label)
set_group(group);
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-RadioToolButton::RadioToolButton(Group& group, const Gtk::StockID& stock_id)
-:
- Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
- Gtk::ToggleToolButton(Glib::ConstructParams(radiotoolbutton_class_.init(), "stock_id",
(stock_id).get_c_str(), nullptr))
-{
- //Based on the source of gtk_radio_tool_button_new_from_stock():
- set_group(group);
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
-/* This would look too much like a copy constructor:
-RadioToolButton::RadioToolButton(RadioToolButton& group, const Gtk::StockID& stock_id)
-:
- Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
- Gtk::ToggleToolButton(Glib::ConstructParams(radiotoolbutton_class_.init(), "stock_id",
(stock_id).get_c_str(), nullptr))
-{
- //Based on the source of gtk_radio_tool_button_new_with_stock_from_widget():
- auto radiogroup = group.get_group();
- set_group(radiogroup);
-}
-*/
-
RadioToolButton::RadioToolButton(Widget& icon_widget, const Glib::ustring& label)
:
Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
diff --git a/gtk/src/radiotoolbutton.hg b/gtk/src/radiotoolbutton.hg
index dd159fe..081b79c 100644
--- a/gtk/src/radiotoolbutton.hg
+++ b/gtk/src/radiotoolbutton.hg
@@ -72,26 +72,10 @@ public:
explicit RadioToolButton(Group& group, const Glib::ustring& label = Glib::ustring());
_IGNORE(gtk_radio_tool_button_new)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new Gtk::RadioToolButton in an existing group.
- *
- * The RadioToolButton will be created according to the StockID properties and put into
- * the Group @a group.
- *
- * @param group The existing group which will be used for this RadioToolButton.
- * @param stock_id The StockID which determines the look of the RadioToolButton.
- *
- * @newin{2,4}
- * @deprecated Use one of the other constructors instead.
- */
- RadioToolButton(Group& group, const Gtk::StockID& stock_id);
- _IGNORE(gtk_radio_tool_button_new_from_stock)
-#endif // GTKMM_DISABLE_DEPRECATED
-
//This would look too much like a copy constructor:
//_WRAP_CTOR(RadioToolButton(RadioToolButton& group), gtk_radio_tool_button_new_from_widget)
//People should use second.join_group(first) instead.
- _IGNORE(gtk_radio_tool_button_new_with_stock_from_widget, gtk_radio_tool_button_new_from_widget)
+ _IGNORE(gtk_radio_tool_button_new_from_widget)
//This does not correspond to any gtk_radio_tool_button_*_new() function,
//but it should work (it just sets properties), and it makes this class consistent with the
diff --git a/gtk/src/range.hg b/gtk/src/range.hg
index d54c7d1..195e91f 100644
--- a/gtk/src/range.hg
+++ b/gtk/src/range.hg
@@ -51,9 +51,6 @@ public:
_WRAP_METHOD(void set_slider_size_fixed(bool size_fixed = true), gtk_range_set_slider_size_fixed)
_WRAP_METHOD(bool get_slider_size_fixed() const, gtk_range_get_slider_size_fixed)
- _WRAP_METHOD(void set_min_slider_size(bool min_size = true), gtk_range_set_min_slider_size, deprecated
"Use the min-height/min-width CSS properties on the slider node.")
- _WRAP_METHOD(int get_min_slider_size() const, gtk_range_get_min_slider_size, deprecated "Use the
min-height/min-width CSS properties on the slider node.")
-
/** This method returns the area that contains the range's trough
* and its steppers, in the widget's Gdk::Window coordinates.
*
diff --git a/gtk/src/recentchoosermenu.hg b/gtk/src/recentchoosermenu.hg
index 67c2dec..7a6972f 100644
--- a/gtk/src/recentchoosermenu.hg
+++ b/gtk/src/recentchoosermenu.hg
@@ -18,7 +18,6 @@
#include <gtkmm/menu.h>
#include <gtkmm/recentchooser.h>
-#include <gtkmm/activatable.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/menu_p.h)
@@ -39,12 +38,10 @@ namespace Gtk
*/
class RecentChooserMenu
: public Menu,
- public RecentChooser,
- public Activatable
+ public RecentChooser
{
_CLASS_GTKOBJECT(RecentChooserMenu, GtkRecentChooserMenu, GTK_RECENT_CHOOSER_MENU, Gtk::Menu, GtkMenu)
_IMPLEMENTS_INTERFACE(RecentChooser)
- _IMPLEMENTS_INTERFACE(Activatable)
public:
_CTOR_DEFAULT;
diff --git a/gtk/src/recentchooserwidget.hg b/gtk/src/recentchooserwidget.hg
index e13b2ae..fdd529f 100644
--- a/gtk/src/recentchooserwidget.hg
+++ b/gtk/src/recentchooserwidget.hg
@@ -19,7 +19,7 @@
#include <gtkmm/recentchooser.h>
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/hvbox_p.h)
+_PINCLUDE(gtkmm/private/box_p.h)
namespace Gtk
{
@@ -37,10 +37,10 @@ namespace Gtk
* @ingroup RecentFiles
*/
class RecentChooserWidget
-: public VBox,
+: public Box,
public RecentChooser
{
- _CLASS_GTKOBJECT(RecentChooserWidget, GtkRecentChooserWidget, GTK_RECENT_CHOOSER_WIDGET, Gtk::VBox,
GtkVBox)
+ _CLASS_GTKOBJECT(RecentChooserWidget, GtkRecentChooserWidget, GTK_RECENT_CHOOSER_WIDGET, Gtk::Box, GtkBox)
_IMPLEMENTS_INTERFACE(RecentChooser)
public:
_CTOR_DEFAULT;
diff --git a/gtk/src/scale.hg b/gtk/src/scale.hg
index e76f883..fd0ad55 100644
--- a/gtk/src/scale.hg
+++ b/gtk/src/scale.hg
@@ -129,10 +129,3 @@ protected:
};
} //namespace Gtk
-
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvscale.h>
-
diff --git a/gtk/src/scrollbar.hg b/gtk/src/scrollbar.hg
index 1b6789b..23d5a99 100644
--- a/gtk/src/scrollbar.hg
+++ b/gtk/src/scrollbar.hg
@@ -57,10 +57,3 @@ public:
};
} //namespace Gtk
-
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvscrollbar.h>
-
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index 6c46781..c43fdc2 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -75,7 +75,6 @@ public:
///Puts the child inside a Gtk::Viewport if it doesn't have native scrolling capability.
void add(Gtk::Widget& widget) override;
- _IGNORE(gtk_scrolled_window_add_with_viewport)
_DEPRECATE_IFDEF_START
/** Removes the contained widget, possibly also a Gtk::Viewport.
@@ -140,7 +139,6 @@ _DEPRECATE_IFDEF_END
_WRAP_PROPERTY("hscrollbar-policy", PolicyType)
_WRAP_PROPERTY("vscrollbar-policy", PolicyType)
_WRAP_PROPERTY("window-placement", CornerType)
- _WRAP_PROPERTY("window-placement-set", bool, deprecated "This value is ignored and the
property_window_placement() value is always honored.")
_WRAP_PROPERTY("shadow-type", ShadowType)
_WRAP_PROPERTY("min-content-width", int)
_WRAP_PROPERTY("min-content-height", int)
diff --git a/gtk/src/separator.hg b/gtk/src/separator.hg
index 422cc93..9ee3cf9 100644
--- a/gtk/src/separator.hg
+++ b/gtk/src/separator.hg
@@ -46,10 +46,3 @@ public:
};
} //namespace Gtk
-
-//Include the deprecated header,
-//whose classes were previously in this header,
-//to preserve the "API" of the includes.
-#include <gtkmm/hvseparator.h>
-
-
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index e85fe6d..1a5ec98 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -26,17 +26,12 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gtk
{
-_WRAP_ENUM(IMPreeditStyle, GtkIMPreeditStyle)
-_WRAP_ENUM(IMStatusStyle, GtkIMStatusStyle)
-
-
/** Sharing settings between applications.
*
*/
class Settings : public Glib::Object
{
_CLASS_GOBJECT(Settings, GtkSettings, GTK_SETTINGS, Glib::Object, GObject)
- _IGNORE(gtk_settings_set_property_value, gtk_settings_set_string_property,
gtk_settings_set_long_property, gtk_settings_set_double_property)
protected:
@@ -56,7 +51,6 @@ public:
_WRAP_PROPERTY("gtk-split-cursor", bool)
_WRAP_PROPERTY("gtk-theme-name", Glib::ustring)
_WRAP_PROPERTY("gtk-key-theme-name", Glib::ustring)
- _WRAP_PROPERTY("gtk-menu-bar-accel", Glib::ustring, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-dnd-drag-threshold", int)
_WRAP_PROPERTY("gtk-font-name", Glib::ustring)
_WRAP_PROPERTY("gtk-modules", Glib::ustring)
@@ -71,67 +65,30 @@ public:
//#endif
_WRAP_PROPERTY("gtk-alternative-button-order", bool)
_WRAP_PROPERTY("gtk-alternative-sort-arrows", bool)
- _WRAP_PROPERTY("gtk-show-input-method-menu", bool, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-show-unicode-menu", bool, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-timeout-initial", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-timeout-repeat", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-timeout-expand", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-color-scheme", Glib::ustring, deprecated "Color scheme support was dropped. This
setting is now ignored.")
_WRAP_PROPERTY("gtk-enable-animations", bool)
- _WRAP_PROPERTY("gtk-touchscreen-mode", bool, deprecated "Generally the behavior for touchscreen input
should be performed dynamically based on gdk_event_get_source_device().")
- _WRAP_PROPERTY("gtk-tooltip-timeout", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-tooltip-browse-timeout", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-tooltip-browse-mode-timeout", int, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-keynav-cursor-only", bool, deprecated "Generally the behavior for touchscreen input
should be performed dynamically based on gdk_event_get_source_device().")
- _WRAP_PROPERTY("gtk-keynav-wrap-around", bool, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-error-bell", bool)
- _WRAP_PROPERTY("color-hash", Gdk::Color, deprecated "Will always return an empty hash table.") //This is
really a hash table.
- _WRAP_PROPERTY("gtk-file-chooser-backend", Glib::ustring, deprecated "This setting is ignored.
Gtk::FileChooser uses GIO by default.")
_WRAP_PROPERTY("gtk-print-backends", Glib::ustring)
_WRAP_PROPERTY("gtk-print-preview-command", Glib::ustring)
- _WRAP_PROPERTY("gtk-enable-mnemonics", bool, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-enable-accels", bool)
- _WRAP_PROPERTY("gtk-recent-files-limit", int, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-im-module", Glib::ustring)
_WRAP_PROPERTY("gtk-recent-files-max-age", int)
_WRAP_PROPERTY("gtk-fontconfig-timestamp", int)
_WRAP_PROPERTY("gtk-sound-theme-name", Glib::ustring)
_WRAP_PROPERTY("gtk-enable-input-feedback-sounds", bool)
_WRAP_PROPERTY("gtk-enable-event-sounds", bool)
- _WRAP_PROPERTY("gtk-enable-tooltips", bool, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-application-prefer-dark-theme", bool) // since 2.22
- _WRAP_PROPERTY("gtk-auto-mnemonics", bool, deprecated "This setting is ignored.") // since 2.20
- _WRAP_PROPERTY("gtk-visible-focus", Gtk::PolicyType, deprecated "This setting is ignored.") // since 3.2
- _WRAP_PROPERTY("gtk-im-preedit-style", IMPreeditStyle, deprecated "This setting is ignored.") //since 3.4
- _WRAP_PROPERTY("gtk-im-status-style", IMStatusStyle, deprecated "This setting is ignored.") //since 3.4
_WRAP_PROPERTY("gtk-shell-shows-app-menu", bool) //since 3.4
_WRAP_PROPERTY("gtk-shell-shows-menubar", bool) //since 3.4
_WRAP_PROPERTY("gtk-shell-shows-desktop", bool) //since 3.12
_WRAP_PROPERTY("gtk-enable-primary-paste", bool) //since 3.6
- _WRAP_PROPERTY("gtk-menu-popup-delay", int, deprecated "This setting is ignored.") //since 3.4
- _WRAP_PROPERTY("gtk-menu-popdown-delay", int, deprecated "This setting is ignored.") //since 3.4
_WRAP_PROPERTY("gtk-label-select-on-focus", bool) //since 3.4
_WRAP_PROPERTY("gtk-entry-password-hint-timeout", guint, deprecated "This setting is ignored.") //since 3.4
- _WRAP_PROPERTY("gtk-menu-images", bool, deprecated "This setting is ignored.") //since 3.4
- _WRAP_PROPERTY("gtk-menu-bar-popup-delay", int, deprecated "This setting is ignored.") //since 3.4
- _WRAP_PROPERTY("gtk-scrolled-window-placement", GtkCornerType, deprecated "This setting is ignored.")
//since 3.4
//TODO: Add others added since?
- _WRAP_PROPERTY("gtk-toolbar-style", ToolbarStyle, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-toolbar-icon-size", IconSize, deprecated "This setting is ignored.")
-
- _WRAP_PROPERTY("gtk-can-change-accels", bool, deprecated "This setting is ignored.")
-
_WRAP_PROPERTY("gtk-entry-select-on-focus", bool)
- _WRAP_PROPERTY("gtk-color-palette", Glib::ustring, deprecated "Only used by the deprecated color selector
widget.")
-
- _WRAP_PROPERTY("gtk-button-images", bool, deprecated "This setting is ignored.")
-
_WRAP_PROPERTY("gtk-icon-theme-name", Glib::ustring)
- _WRAP_PROPERTY("gtk-fallback-icon-theme", Glib::ustring, deprecated "This setting is ignored.")
- _WRAP_PROPERTY("gtk-icon-sizes", Glib::ustring, deprecated "This setting is ignored.")
_WRAP_PROPERTY("gtk-recent-files-enabled", bool)
_WRAP_PROPERTY("gtk-primary-button-warps-slider", bool)
diff --git a/gtk/src/sizegroup.hg b/gtk/src/sizegroup.hg
index 9f42727..97919de 100644
--- a/gtk/src/sizegroup.hg
+++ b/gtk/src/sizegroup.hg
@@ -63,11 +63,6 @@ public:
_WRAP_METHOD(void set_mode(SizeGroupMode mode), gtk_size_group_set_mode)
_WRAP_METHOD(SizeGroupMode get_mode() const, gtk_size_group_get_mode)
- _WRAP_METHOD(void set_ignore_hidden(bool ignore_hidden = true), gtk_size_group_set_ignore_hidden,
- deprecated "Does not work reliably. Use a Gtk::Stack instead to hide widgets while still having their
size taken into account.")
- _WRAP_METHOD(bool get_ignore_hidden() const, gtk_size_group_get_ignore_hidden,
- deprecated "Does not work reliably. Use a Gtk::Stack instead to hide widgets while still having their
size taken into account.")
-
_WRAP_METHOD(void add_widget(Widget& widget), gtk_size_group_add_widget)
_WRAP_METHOD(void remove_widget(Widget& widget), gtk_size_group_remove_widget)
@@ -77,8 +72,6 @@ public:
_WRAP_METHOD(std::vector<const Widget*> get_widgets() const, gtk_size_group_get_widgets)
_WRAP_PROPERTY("mode", SizeGroupMode)
- _WRAP_PROPERTY("ignore_hidden", bool,
- deprecated "Does not work reliably. Use a Gtk::Stack instead to hide widgets while still having their
size taken into account.")
};
} //namespace Gtk
diff --git a/gtk/src/statusbar.hg b/gtk/src/statusbar.hg
index e3ae4a2..42db2f6 100644
--- a/gtk/src/statusbar.hg
+++ b/gtk/src/statusbar.hg
@@ -19,7 +19,7 @@
#include <gtkmm/box.h>
_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/hvbox_p.h)
+_PINCLUDE(gtkmm/private/box_p.h)
namespace Gtk
{
@@ -30,17 +30,16 @@ namespace Gtk
* When text is pushed it replaces the old contents.
* The old text is restored when popped.
*
- * It derives from Gtk::HBox so that additional information can be added
- * easily.
+ * It derives from Gtk::Box so that additional information can be added easily.
*
* The Statusbar widget looks like this:
* @image html statusbar1.png
*
* @ingroup Widgets
*/
-class Statusbar : public HBox //Note: The C object derives from GtkBox.
+class Statusbar : public Box
{
- _CLASS_GTKOBJECT(Statusbar,GtkStatusbar,GTK_STATUSBAR,Gtk::HBox,GtkHBox)
+ _CLASS_GTKOBJECT(Statusbar,GtkStatusbar,GTK_STATUSBAR,Gtk::Box,GtkBox)
_IGNORE(gtk_statusbar_push)
public:
_CTOR_DEFAULT
diff --git a/gtk/src/stylecontext.ccg b/gtk/src/stylecontext.ccg
index 71d3be9..3d79370 100644
--- a/gtk/src/stylecontext.ccg
+++ b/gtk/src/stylecontext.ccg
@@ -23,26 +23,26 @@ namespace Gtk
{
-Gdk::RGBA StyleContext::get_color(StateFlags state) const
+Gdk::RGBA StyleContext::get_color() const
{
GdkRGBA crgba;
- gtk_style_context_get_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &crgba);
+ gtk_style_context_get_color(const_cast<GtkStyleContext*>(gobj()), &crgba);
return Gdk::RGBA(&crgba, true);
}
_DEPRECATE_IFDEF_START
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-Gdk::RGBA StyleContext::get_background_color(StateFlags state) const
+Gdk::RGBA StyleContext::get_background_color() const
{
GdkRGBA crgba;
- gtk_style_context_get_background_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)),
&crgba);
+ gtk_style_context_get_background_color(const_cast<GtkStyleContext*>(gobj()), &crgba);
return Gdk::RGBA(&crgba, true);
}
-Gdk::RGBA StyleContext::get_border_color(StateFlags state) const
+Gdk::RGBA StyleContext::get_border_color() const
{
GdkRGBA crgba;
- gtk_style_context_get_border_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &crgba);
+ gtk_style_context_get_border_color(const_cast<GtkStyleContext*>(gobj()), &crgba);
return Gdk::RGBA(&crgba, true);
}
G_GNUC_END_IGNORE_DEPRECATIONS
@@ -50,31 +50,30 @@ _DEPRECATE_IFDEF_END
Pango::FontDescription StyleContext::get_font(StateFlags state) const
{
- // gtk_style_context_get_font() is deprecated.
PangoFontDescription* description = nullptr;
gtk_style_context_get(const_cast<GtkStyleContext*>(gobj()), (GtkStateFlags)state, "font", &description,
NULL);
// gtk_style_context_get() returns a newly allocated font description, owned by the caller.
return Glib::wrap(description, false);
}
-Border StyleContext::get_border(StateFlags state) const
+Border StyleContext::get_border() const
{
GtkBorder cborder;
- gtk_style_context_get_border(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
+ gtk_style_context_get_border(const_cast<GtkStyleContext*>(gobj()), &cborder);
return Border(&cborder, true);
}
-Border StyleContext::get_padding(StateFlags state) const
+Border StyleContext::get_padding() const
{
GtkBorder cborder;
- gtk_style_context_get_padding(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
+ gtk_style_context_get_padding(const_cast<GtkStyleContext*>(gobj()), &cborder);
return Border(&cborder, true);
}
-Border StyleContext::get_margin(StateFlags state) const
+Border StyleContext::get_margin() const
{
GtkBorder cborder;
- gtk_style_context_get_margin(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
+ gtk_style_context_get_margin(const_cast<GtkStyleContext*>(gobj()), &cborder);
return Border(&cborder, true);
}
diff --git a/gtk/src/stylecontext.hg b/gtk/src/stylecontext.hg
index 2f4cf9a..7a8d322 100644
--- a/gtk/src/stylecontext.hg
+++ b/gtk/src/stylecontext.hg
@@ -26,8 +26,6 @@ _PINCLUDE(gtk/gtk.h)
#include <gdkmm/screen.h>
#include <gtkmm/enums.h>
-#include <gtkmm/iconsource.h>
-#include <gtkmm/iconset.h>
#include <gtkmm/widgetpath.h>
#include <pangomm/context.h>
#include <pangomm/fontdescription.h>
@@ -38,8 +36,6 @@ _PINCLUDE(gtk/gtk.h)
namespace Gtk
{
-class IconSet;
-
//TODO: Add (and translate to C++) the code examples from the C documentation.
/** This object stores styling information affecting a widget defined by WidgetPath.
*
@@ -136,8 +132,6 @@ public:
_WRAP_METHOD(void set_scale(int scale), gtk_style_context_set_scale)
_WRAP_METHOD(int get_scale() const, gtk_style_context_get_scale)
- _WRAP_METHOD(bool state_is_running(StateType state, gdouble* progress),
gtk_style_context_state_is_running, deprecated "This function always returns <tt>false</tt>.")
-
_WRAP_METHOD(void set_path(const WidgetPath& path), gtk_style_context_set_path)
#m4 _CONVERSION(`const GtkWidgetPath*',`WidgetPath',`WidgetPath(const_cast<GtkWidgetPath*>($3), true)')
@@ -156,11 +150,6 @@ public:
_WRAP_METHOD(void remove_class(const Glib::ustring& class_name), gtk_style_context_remove_class)
_WRAP_METHOD(bool has_class(const Glib::ustring& class_name), gtk_style_context_has_class)
- _WRAP_METHOD(GList* list_regions(), gtk_style_context_list_regions, deprecated "There is no replacement.")
- _WRAP_METHOD(void add_region(const Glib::ustring& region_name, RegionFlags flags),
gtk_style_context_add_region, deprecated "There is no replacement.")
- _WRAP_METHOD(void remove_region(const Glib::ustring& region_name), gtk_style_context_remove_region,
deprecated "There is no replacement.")
- _WRAP_METHOD(bool has_region(const Glib::ustring& region_name, RegionFlags& flags_return),
gtk_style_context_has_region, deprecated "There is no replacement.")
-
/** Gets the value of a style property
* @param property_name The name of a style property.
* @param value Location to return the property value.
@@ -173,52 +162,34 @@ public:
gtk_style_context_get_style_property)
_IGNORE(gtk_style_context_get_style, gtk_style_context_get_style, )
- _WRAP_METHOD(Glib::RefPtr<IconSet> lookup_icon_set(const Glib::ustring& stock_id),
gtk_style_context_lookup_icon_set, refreturn, deprecated "Use IconTheme::lookup_icon() instead.")
-
- // gtk_icon_set_render_icon_pixbuf() in gtkstylecontext.h is wrapped in IconSet::render_icon_pixbuf().
-
_WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_style_context_set_screen)
_WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_style_context_get_screen, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_style_context_get_screen, refreturn,
constversion)
- _WRAP_METHOD(void set_direction(TextDirection direction), gtk_style_context_set_direction,
- deprecated "Use set_state() with Gtk::STATE_FLAG_DIR_LTR and Gtk::STATE_FLAG_DIR_RTL instead.")
- _WRAP_METHOD(TextDirection get_direction() const, gtk_style_context_get_direction,
- deprecated "Use get_state() and check for Gtk::STATE_FLAG_DIR_LTR and Gtk::STATE_FLAG_DIR_RTL instead.")
-
_WRAP_METHOD(void set_junction_sides(JunctionSides sides), gtk_style_context_set_junction_sides)
_WRAP_METHOD(JunctionSides get_junction_sides() const, gtk_style_context_get_junction_sides)
_WRAP_METHOD(bool lookup_color(const Glib::ustring& color_name, Gdk::RGBA& color),
gtk_style_context_lookup_color)
- _WRAP_METHOD(void notify_state_change(const Glib::RefPtr<Gdk::Window>& window, gpointer region_id,
StateType state, bool state_value), gtk_style_context_notify_state_change, deprecated "This function does
nothing.")
-
- _WRAP_METHOD(void cancel_animations(gpointer region_id), gtk_style_context_cancel_animations, deprecated
"This function does nothing.")
- _WRAP_METHOD(void scroll_animations(const Glib::RefPtr<Gdk::Window>& window, int dx, int dy),
gtk_style_context_scroll_animations, deprecated "This function does nothing.")
-
- _WRAP_METHOD(void push_animatable_region(gpointer region_id), gtk_style_context_push_animatable_region,
deprecated "This function does nothing.")
- _WRAP_METHOD(void pop_animatable_region(), gtk_style_context_pop_animatable_region, deprecated "This
function does nothing.")
-
/** Gets the foreground color for a given state.
*
* @newin{3,0}
*
- * @param state State to retrieve the color for.
* @return The foreground color for the given state.
*/
- Gdk::RGBA get_color(StateFlags state = (StateFlags)0) const;
+ Gdk::RGBA get_color() const;
_IGNORE(gtk_style_context_get_color)
_DEPRECATE_IFDEF_START
/** @deprecated Use render_background() instead.
*/
- Gdk::RGBA get_background_color(StateFlags state = (StateFlags)0) const;
+ Gdk::RGBA get_background_color() const;
_IGNORE(gtk_style_context_get_background_color)
/** @deprecated Use render_frame() instead.
*/
- Gdk::RGBA get_border_color(StateFlags state = (StateFlags)0) const;
+ Gdk::RGBA get_border_color() const;
_IGNORE(gtk_style_context_get_border_color)
_DEPRECATE_IFDEF_END
@@ -230,23 +201,18 @@ _DEPRECATE_IFDEF_END
* @return The Pango::FontDescription for the given state.
*/
Pango::FontDescription get_font(StateFlags state = (StateFlags)0) const;
- _IGNORE(gtk_style_context_get_font)
- Border get_border(StateFlags state = (StateFlags)0) const;
+ Border get_border() const;
_IGNORE(gtk_style_context_get_border)
- Border get_padding(StateFlags state = (StateFlags)0) const;
+ Border get_padding() const;
_IGNORE(gtk_style_context_get_padding)
- Border get_margin (StateFlags state = (StateFlags)0) const;
+ Border get_margin() const;
_IGNORE(gtk_style_context_get_margin)
- _WRAP_METHOD(void invalidate(), gtk_style_context_invalidate, deprecated "Style contexts are invalidated
automatically.")
//TODO: _WRAP_METHOD(void reset_widgets(const Glib::RefPtr<Gdk::Screen>& screen),
gtk_style_context_reset_widgets)
- _WRAP_METHOD(void set_background(const Glib::RefPtr<Gdk::Window>& window),
gtk_style_context_set_background,
- deprecated "Use render_background() instead. Note that clients still using this function are now
responsible for calling this function again whenever the context is invalidated.")
-
_WRAP_METHOD(void render_check(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double
width, double height), gtk_render_check)
_WRAP_METHOD(void render_option(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double
width, double height), gtk_render_option)
_WRAP_METHOD(void render_arrow(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double angle, double x,
double y, double size), gtk_render_arrow)
@@ -262,7 +228,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void render_extension(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y,
double width, double height, PositionType gap_side), gtk_render_extension)
_WRAP_METHOD(void render_handle(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double
width, double height), gtk_render_handle)
_WRAP_METHOD(void render_activity(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y,
double width, double height), gtk_render_activity)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> render_icon_pixbuf(const IconSource& source, IconSize size),
gtk_render_icon_pixbuf, deprecated "Use IconTheme::load_icon() instead.")
_WRAP_METHOD(void render_icon(const ::Cairo::RefPtr< ::Cairo::Context>& cr, const
Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double x, double y), gtk_render_icon)
_WRAP_METHOD(void render_insertion_cursor(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double
y, const Glib::RefPtr<Pango::Layout>& layout, int index, Pango::Direction direction),
gtk_render_insertion_cursor)
@@ -270,8 +235,6 @@ _DEPRECATE_IFDEF_END
_WRAP_SIGNAL(void changed(), "changed")
_WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
- _WRAP_PROPERTY("direction", TextDirection,
- deprecated "Use set_state()/get_state() and Gtk::STATE_FLAG_DIR_LTR/Gtk::STATE_FLAG_DIR_RTL instead.")
_WRAP_PROPERTY("parent", Glib::RefPtr<StyleContext>)
};
diff --git a/gtk/src/switch.hg b/gtk/src/switch.hg
index babd4e1..ff9f8ad 100644
--- a/gtk/src/switch.hg
+++ b/gtk/src/switch.hg
@@ -16,15 +16,14 @@
*/
#include <gtkmm/widget.h>
-#include <gtkmm/activatable.h>
+#include <gtkmm/actionable.h>
+
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/widget_p.h)
namespace Gtk
{
-//TODO: Derive from (and implement) Actionable when we can break ABI.
-
/** A "light switch"-style toggle.
*
* The Switch widget has two states: on or off. The user can control
@@ -36,10 +35,10 @@ namespace Gtk
*/
class Switch
: public Widget,
- public Activatable
+ public Actionable
{
_CLASS_GTKOBJECT(Switch, GtkSwitch, GTK_SWITCH, Gtk::Widget, GtkWidget)
- _IMPLEMENTS_INTERFACE(Activatable)
+ _IMPLEMENTS_INTERFACE(Actionable)
public:
_CTOR_DEFAULT
diff --git a/gtk/src/textiter.ccg b/gtk/src/textiter.ccg
index 2ccc68e..83b90b3 100644
--- a/gtk/src/textiter.ccg
+++ b/gtk/src/textiter.ccg
@@ -43,14 +43,6 @@ bool TextIter::starts_tag() const
{
return gtk_text_iter_starts_tag(const_cast<GtkTextIter*>(gobj()), nullptr /* see C docs */);
}
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-bool TextIter::begins_tag() const
-{
- return gtk_text_iter_begins_tag(const_cast<GtkTextIter*>(gobj()), nullptr /* see C docs */);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
bool TextIter::ends_tag() const
{
diff --git a/gtk/src/textiter.hg b/gtk/src/textiter.hg
index 341e45b..66bf5d0 100644
--- a/gtk/src/textiter.hg
+++ b/gtk/src/textiter.hg
@@ -74,26 +74,6 @@ public:
/** Alias for get_char(). */
inline value_type operator*() const;
-_DEPRECATE_IFDEF_START
- /** This typedef is just to make it more obvious that
- * our operator const void* should be used like operator bool().
- *
- * @deprecated Use the explicit operator bool() instead.
- */
- typedef const void* BoolExpr;
-
- /** Alias for !is_end()
- * For instance,
- * @code
- * if(textiter)
- * do_something()
- * @endcode
- *
- * @deprecated Use the explicit operator bool() instead.
- */
- inline operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
/** Alias for !is_end()
* For instance,
* @code
@@ -159,13 +139,6 @@ public:
_WRAP_METHOD(bool starts_tag(const Glib::RefPtr<const TextTag>& tag) const, gtk_text_iter_starts_tag)
bool starts_tag() const;
- _WRAP_METHOD(bool begins_tag(const Glib::RefPtr<const TextTag>& tag) const, gtk_text_iter_begins_tag,
- deprecated "Use starts_tag() instead.")
-_DEPRECATE_IFDEF_START
- /** @deprecated Use starts_tag() instead.
- */
- bool begins_tag() const;
-_DEPRECATE_IFDEF_END
_WRAP_METHOD(bool ends_tag(const Glib::RefPtr<const TextTag>& tag) const, gtk_text_iter_ends_tag)
bool ends_tag() const;
_WRAP_METHOD(bool toggles_tag(const Glib::RefPtr<const TextTag>& tag) const, gtk_text_iter_toggles_tag)
@@ -358,14 +331,6 @@ TextIter::value_type TextIter::operator*() const
return get_char();
}
-_DEPRECATE_IFDEF_START
-inline
-TextIter::operator BoolExpr() const
-{
- return !is_end() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
inline
TextIter::operator bool() const
{
diff --git a/gtk/src/texttag.hg b/gtk/src/texttag.hg
index fbe8d9f..668af6b 100644
--- a/gtk/src/texttag.hg
+++ b/gtk/src/texttag.hg
@@ -75,9 +75,7 @@ public:
_WRAP_PROPERTY("name", Glib::ustring) //construct-only.
_WRAP_PROPERTY("background", Glib::ustring)
_WRAP_PROPERTY("foreground", Glib::ustring)
- _WRAP_PROPERTY("background-gdk", Gdk::Color, deprecated "Use property_background_rgba() instead.")
_WRAP_PROPERTY("background-rgba", Gdk::RGBA)
- _WRAP_PROPERTY("foreground-gdk", Gdk::Color, deprecated "Use property_foreground_rgba() instead.")
_WRAP_PROPERTY("foreground-rgba", Gdk::RGBA)
_WRAP_PROPERTY("font", Glib::ustring)
_WRAP_PROPERTY("font-desc", Pango::FontDescription)
@@ -109,7 +107,6 @@ public:
_WRAP_PROPERTY("tabs", Pango::TabArray)
_WRAP_PROPERTY("invisible", bool)
_WRAP_PROPERTY("paragraph-background", Glib::ustring)
- _WRAP_PROPERTY("paragraph-background-gdk", Gdk::Color, deprecated "Use
property_paragraph_background_rgba() instead.")
_WRAP_PROPERTY("paragraph-background-rgba", Gdk::RGBA)
_WRAP_PROPERTY("font-features", Glib::ustring, newin "3,20")
_WRAP_PROPERTY("accumulative-margin", bool)
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 6ae97a1..30d497f 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -139,8 +139,6 @@ public:
int window_x, int window_y,
int& buffer_x, int& buffer_y) const,
gtk_text_view_window_to_buffer_coords)
- _IGNORE(gtk_text_view_get_hadjustment, gtk_text_view_get_vadjustment) //deprecated
-
_WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(TextWindowType win), gtk_text_view_get_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window(TextWindowType win) const,
gtk_text_view_get_window, refreturn, constversion)
_WRAP_METHOD(TextWindowType get_window_type(const Glib::RefPtr<Gdk::Window>& window),
gtk_text_view_get_window_type)
diff --git a/gtk/src/togglebutton.ccg b/gtk/src/togglebutton.ccg
index 7a542f4..4b514b4 100644
--- a/gtk/src/togglebutton.ccg
+++ b/gtk/src/togglebutton.ccg
@@ -26,11 +26,4 @@ ToggleButton::ToggleButton(const Glib::ustring& label, bool mnemonic)
_CONSTRUCT("label", label.c_str(), "use_underline", gboolean(mnemonic))
{}
-#ifndef GTKMM_DISABLE_DEPRECATED
-ToggleButton::ToggleButton(const StockID& stock_id)
-:
- _CONSTRUCT("use_stock", 1, "label", stock_id.get_c_str())
-{}
-#endif // GTKMM_DISABLE_DEPRECATED
-
} // namespace Gtk
diff --git a/gtk/src/togglebutton.hg b/gtk/src/togglebutton.hg
index eacec38..8117cb0 100644
--- a/gtk/src/togglebutton.hg
+++ b/gtk/src/togglebutton.hg
@@ -50,15 +50,6 @@ public:
*/
explicit ToggleButton(const Glib::ustring& label, bool mnemonic = false);
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a toggle button containing the image and text from a stock item.
- * Stock ids have identifiers like Gtk::Stock::OK and Gtk::Stock::APPLY.
- * @param stock_id The stock item.
- * @deprecated Use the constructor that takes a Glib::ustring instead.
- */
- explicit ToggleButton(const StockID& stock_id);
-#endif // GTKMM_DISABLE_DEPRECATED
-
_WRAP_METHOD(void set_mode(bool draw_indicator = true),gtk_toggle_button_set_mode)
_WRAP_METHOD(bool get_mode() const,gtk_toggle_button_get_mode)
diff --git a/gtk/src/toggletoolbutton.ccg b/gtk/src/toggletoolbutton.ccg
index 68c91e0..a140890 100644
--- a/gtk/src/toggletoolbutton.ccg
+++ b/gtk/src/toggletoolbutton.ccg
@@ -21,16 +21,6 @@
namespace Gtk
{
-#ifndef GTKMM_DISABLE_DEPRECATED
-ToggleToolButton::ToggleToolButton(const Gtk::StockID& stock_id)
-:
- // Mark this class as non-derived to allow C++ vfuncs to be skipped.
- Glib::ObjectBase(nullptr),
- Gtk::ToolButton(Glib::ConstructParams(toggletoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(),
nullptr))
-{
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
ToggleToolButton::ToggleToolButton(const Glib::ustring& label)
:
Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
diff --git a/gtk/src/toggletoolbutton.hg b/gtk/src/toggletoolbutton.hg
index 89b7814..79c3552 100644
--- a/gtk/src/toggletoolbutton.hg
+++ b/gtk/src/toggletoolbutton.hg
@@ -42,20 +42,6 @@ public:
*/
_CTOR_DEFAULT()
- // _WRAP_CTOR does not take a 'deprecated' parameter.
- // _WRAP_CTOR(ToggleToolButton(const Gtk::StockID& stock_id), gtk_toggle_tool_button_new_from_stock)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new ToggleToolButton from a StockID.
- *
- * The ToggleToolButton will be created according to the @a stock_id properties.
- *
- * @param stock_id The StockID which determines the look of the ToggleToolButton.
- * @deprecated Use one of the other constructors instead.
- */
- explicit ToggleToolButton(const Gtk::StockID& stock_id);
- _IGNORE(gtk_toggle_tool_button_new_from_stock)
-#endif // GTKMM_DISABLE_DEPRECATED
-
/** Creates a new ToggleToolButton with a label.
*
* The ToggleToolButton will have the label @a label.
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 78addd9..40e8a9b 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -79,7 +79,6 @@ public:
_WRAP_METHOD(IconSize get_icon_size() const, gtk_toolbar_get_icon_size)
- _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_toolbar_get_relief_style)
_WRAP_METHOD(int get_drop_index(int x, int y) const, gtk_toolbar_get_drop_index)
_WRAP_METHOD(void set_drop_highlight_item(ToolItem& tool_item, int index),
gtk_toolbar_set_drop_highlight_item)
void unset_drop_highlight_item();
diff --git a/gtk/src/toolbutton.ccg b/gtk/src/toolbutton.ccg
index 1146ed1..f3036cb 100644
--- a/gtk/src/toolbutton.ccg
+++ b/gtk/src/toolbutton.ccg
@@ -20,15 +20,6 @@
namespace Gtk
{
-#ifndef GTKMM_DISABLE_DEPRECATED
-ToolButton::ToolButton(const Gtk::StockID& stock_id)
-:
- // Mark this class as non-derived to allow C++ vfuncs to be skipped.
- Glib::ObjectBase(nullptr),
- Gtk::ToolItem(Glib::ConstructParams(toolbutton_class_.init(), "stock_id", (stock_id).get_c_str(), nullptr))
-{}
-#endif // GTKMM_DISABLE_DEPRECATED
-
ToolButton::ToolButton(const Glib::ustring& label)
:
Glib::ObjectBase(nullptr), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow
vfunc optimisations.
diff --git a/gtk/src/toolbutton.hg b/gtk/src/toolbutton.hg
index 2e651a1..9c76983 100644
--- a/gtk/src/toolbutton.hg
+++ b/gtk/src/toolbutton.hg
@@ -39,20 +39,6 @@ public:
*/
_CTOR_DEFAULT()
- // _WRAP_CTOR does not take a 'deprecated' parameter.
- // _WRAP_CTOR(ToolButton(const Gtk::StockID& stock_id), gtk_tool_button_new_from_stock)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Creates a new ToolButton from a StockID.
- *
- * The ToolButton will be created according to the @a stock_id properties.
- *
- * @param stock_id The StockID which determines the look of the ToolButton.
- * @deprecated Use the constructor with @a icon_widget and @a label parameters instead.
- */
- explicit ToolButton(const Gtk::StockID& stock_id);
- _IGNORE(gtk_tool_button_new_from_stock)
-#endif // GTKMM_DISABLE_DEPRECATED
-
/** Creates a new ToolButton with a label.
*
* The ToolButton will have the label @a label.
@@ -74,8 +60,6 @@ public:
_WRAP_METHOD(Glib::ustring get_label() const, gtk_tool_button_get_label)
_WRAP_METHOD(void set_use_underline(bool use_underline = true), gtk_tool_button_set_use_underline)
_WRAP_METHOD(bool get_use_underline() const, gtk_tool_button_get_use_underline)
- _WRAP_METHOD(void set_stock_id(const Gtk::StockID& stock_id), gtk_tool_button_set_stock_id, deprecated
"Use set_icon_name() instead.")
- _WRAP_METHOD(Glib::ustring get_stock_id() const, gtk_tool_button_get_stock_id, deprecated "Use
get_icon_name() instead.")
_WRAP_METHOD(void set_icon_name(const Glib::ustring& icon_name), gtk_tool_button_set_icon_name)
_WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_tool_button_get_icon_name)
_WRAP_METHOD(void set_icon_widget(Widget& icon_widget), gtk_tool_button_set_icon_widget)
@@ -91,7 +75,6 @@ public:
_WRAP_PROPERTY("label", Glib::ustring)
_WRAP_PROPERTY("use_underline", bool)
_WRAP_PROPERTY("label_widget", Gtk::Widget*)
- _WRAP_PROPERTY("stock_id", Glib::ustring, deprecated "Use property_icon_name() instead.")
_WRAP_PROPERTY("icon_name", Glib::ustring)
_WRAP_PROPERTY("icon_widget", Gtk::Widget)
};
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 78bbefc..b974d76 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -21,7 +21,6 @@
_CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/bin.h>
-#include <gtkmm/activatable.h>
#include <gtkmm/sizegroup.h>
_DEFS(gtkmm,gtk)
@@ -43,12 +42,9 @@ namespace Gtk
*
* @ingroup Widgets
*/
-class ToolItem
- : public Bin,
- public Activatable
+class ToolItem : public Bin
{
_CLASS_GTKOBJECT(ToolItem, GtkToolItem, GTK_TOOL_ITEM, Gtk::Bin, GtkBin)
- _IMPLEMENTS_INTERFACE(Activatable)
public:
_CTOR_DEFAULT
@@ -77,7 +73,6 @@ public:
_WRAP_METHOD(IconSize get_icon_size () const, gtk_tool_item_get_icon_size)
_WRAP_METHOD(Orientation get_orientation() const, gtk_tool_item_get_orientation)
_WRAP_METHOD(ToolbarStyle get_toolbar_style() const, gtk_tool_item_get_toolbar_style)
- _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_tool_item_get_relief_style)
_WRAP_METHOD(float get_text_alignment() const, gtk_tool_item_get_text_alignment)
_WRAP_METHOD(Orientation get_text_orientation() const, gtk_tool_item_get_text_orientation)
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
index 879e575..95cf027 100644
--- a/gtk/src/toolpalette.hg
+++ b/gtk/src/toolpalette.hg
@@ -89,10 +89,6 @@ public:
_WRAP_METHOD(void set_drag_source(ToolPaletteDragTargets targets = TOOL_PALETTE_DRAG_ITEMS),
gtk_tool_palette_set_drag_source)
_WRAP_METHOD(void add_drag_dest(Gtk::Widget& widget, DestDefaults flags = DEST_DEFAULT_ALL,
ToolPaletteDragTargets targets = TOOL_PALETTE_DRAG_ITEMS, Gdk::DragAction actions = Gdk::ACTION_COPY),
gtk_tool_palette_add_drag_dest)
- _IGNORE(gtk_tool_palette_get_hadjustment, gtk_tool_palette_get_hadjustment,
- gtk_tool_palette_get_vadjustment, gtk_tool_palette_get_vadjustment)
-
-
#m4 _CONVERSION(`const GtkTargetEntry*',`TargetEntry',`TargetEntry(*$3)')
_WRAP_METHOD(static TargetEntry get_drag_target_item(), gtk_tool_palette_get_drag_target_item)
_WRAP_METHOD(static TargetEntry get_drag_target_group(), gtk_tool_palette_get_drag_target_group)
diff --git a/gtk/src/toolshell.hg b/gtk/src/toolshell.hg
index b930bc6..e36086c 100644
--- a/gtk/src/toolshell.hg
+++ b/gtk/src/toolshell.hg
@@ -45,7 +45,6 @@ public:
_WRAP_METHOD(IconSize get_icon_size() const, gtk_tool_shell_get_icon_size)
_WRAP_METHOD(Orientation get_orientation() const, gtk_tool_shell_get_orientation)
_WRAP_METHOD(ToolbarStyle get_style() const, gtk_tool_shell_get_style)
- _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_tool_shell_get_relief_style)
_WRAP_METHOD(void rebuild_menu(), gtk_tool_shell_rebuild_menu)
_WRAP_METHOD(Orientation get_text_orientation() const, gtk_tool_shell_get_text_orientation)
_WRAP_METHOD(float get_text_alignment() const, gtk_tool_shell_get_text_alignment)
@@ -59,7 +58,6 @@ protected:
_WRAP_VFUNC(IconSize get_icon_size(), get_icon_size)
_WRAP_VFUNC(Orientation get_orientation(), get_orientation)
_WRAP_VFUNC(ToolbarStyle get_style(), get_style)
- _WRAP_VFUNC(ReliefStyle get_relief_style(), get_relief_style)
_WRAP_VFUNC(void rebuild_menu(), rebuild_menu)
//TODO: Add the other vfuncs when we can break ABI.
};
diff --git a/gtk/src/tooltip.hg b/gtk/src/tooltip.hg
index ee14371..34be32c 100644
--- a/gtk/src/tooltip.hg
+++ b/gtk/src/tooltip.hg
@@ -46,7 +46,7 @@ namespace Gtk
* object. This is the object that we are about to display as a
* tooltip, and can be manipulated in your callback using functions
* like Gtk::Tooltip::set_icon(). There are functions for setting
- * the tooltip's markup, setting an image from a stock icon, or
+ * the tooltip's markup, setting an image from a named icon, or
* even putting in a custom widget.
*
* - Return true from your query-tooltip handler. This causes
@@ -93,7 +93,6 @@ public:
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Gio::Icon>& gicon, IconSize size),
gtk_tooltip_set_icon_from_gicon)
//TODO: Remove the _from_*() suffixes?
- _WRAP_METHOD(void set_icon_from_stock(const StockID& stock_id, IconSize size),
gtk_tooltip_set_icon_from_stock, deprecated "Use set_icon_from_icon_name() instead.")
_WRAP_METHOD(void set_icon_from_icon_name(const Glib::ustring& icon_name, IconSize size),
gtk_tooltip_set_icon_from_icon_name)
/** Hide the image.
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 67793e4..8595b71 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -102,7 +102,7 @@ class TreeView
{
_CLASS_GTKOBJECT(TreeView, GtkTreeView, GTK_TREE_VIEW, Gtk::Container, GtkContainer)
_IMPLEMENTS_INTERFACE(Scrollable)
- _IGNORE(gtk_tree_view_get_path_at_pos, gtk_tree_view_set_destroy_count_func, gtk_tree_view_get_cursor
+ _IGNORE(gtk_tree_view_get_path_at_pos, gtk_tree_view_get_cursor,
gtk_tree_view_insert_column_with_data_func, gtk_tree_view_get_drag_dest_row,
gtk_tree_view_get_dest_row_at_pos)
public:
/** A visible column in a Gtk::TreeView widget.
@@ -136,16 +136,12 @@ public:
_WRAP_METHOD(Glib::RefPtr<TreeSelection> get_selection(), gtk_tree_view_get_selection, refreturn)
_WRAP_METHOD(Glib::RefPtr<const TreeSelection> get_selection() const, gtk_tree_view_get_selection,
refreturn, constversion)
- _IGNORE(gtk_tree_view_get_hadjustment, gtk_tree_view_get_vadjustment,
- gtk_tree_view_set_hadjustment, gtk_tree_view_set_vadjustment) //deprecated
_WRAP_METHOD(bool get_headers_visible() const, gtk_tree_view_get_headers_visible)
_WRAP_METHOD(void set_headers_visible(bool headers_visible = true), gtk_tree_view_set_headers_visible)
_WRAP_METHOD(void columns_autosize(), gtk_tree_view_columns_autosize)
_WRAP_METHOD(bool get_headers_clickable() const, gtk_tree_view_get_headers_clickable)
_WRAP_METHOD(void set_headers_clickable(bool setting = true), gtk_tree_view_set_headers_clickable)
- _WRAP_METHOD(void set_rules_hint(bool setting = true), gtk_tree_view_set_rules_hint, deprecated "Don't use
this API. There is no replacement.")
- _WRAP_METHOD(bool get_rules_hint() const, gtk_tree_view_get_rules_hint, deprecated "Don't use this API.
There is no replacement.")
_WRAP_METHOD(void set_activate_on_single_click(bool single = true),
gtk_tree_view_set_activate_on_single_click)
_WRAP_METHOD(bool get_activate_on_single_click() const, gtk_tree_view_get_activate_on_single_click)
@@ -263,12 +259,6 @@ public:
template <class ColumnType> inline
int insert_column_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column,
int position);
-_DEPRECATE_IFDEF_START
- /** @deprecated Use SlotTreeCellData instead.
- */
- typedef TreeViewColumn::SlotCellData SlotCellData;
-_DEPRECATE_IFDEF_END
-
typedef TreeViewColumn::SlotTreeCellData SlotTreeCellData;
/**
@@ -825,7 +815,6 @@ _CONVERSION(`GtkTreeIter*',`const TreeModel::iterator&',`TreeModel::iterator(gtk
_WRAP_PROPERTY("headers-clickable", bool)
_WRAP_PROPERTY("expander-column", TreeViewColumn*)
_WRAP_PROPERTY("reorderable", bool)
- _WRAP_PROPERTY("rules-hint", bool, deprecated "Don't use this API. There is no replacement.")
_WRAP_PROPERTY("enable-search", bool)
_WRAP_PROPERTY("search-column", int)
_WRAP_PROPERTY("fixed-height-mode", bool)
diff --git a/gtk/src/viewport.hg b/gtk/src/viewport.hg
index 22feca8..8e11e3c 100644
--- a/gtk/src/viewport.hg
+++ b/gtk/src/viewport.hg
@@ -40,10 +40,6 @@ public:
_WRAP_CTOR(Viewport(const Glib::RefPtr<Adjustment>& hadjustment, const Glib::RefPtr<Adjustment>&
vadjustment), gtk_viewport_new)
-
- _IGNORE(gtk_viewport_get_hadjustment, gtk_viewport_get_vadjustment,
- gtk_viewport_set_hadjustment, gtk_viewport_set_vadjustment) //deprecated
-
_WRAP_METHOD(void set_shadow_type(ShadowType type),
gtk_viewport_set_shadow_type)
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index 6840b50..854e165 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -23,9 +23,8 @@
#include <gtkmm/settings.h>
#include <gtkmm/container.h>
#include <gtkmm/selectiondata_private.h>
-#include <gtkmm/action.h>
#include <gtkmm/tooltip.h>
-#include <gtk/gtk.h> //For gtk_widget_get_action().
+#include <gtk/gtk.h>
namespace //anonymous
@@ -226,173 +225,6 @@ void Widget_Class::drag_data_get_callback(GtkWidget* self, GdkDragContext* p0, G
}
}
-//These vfunc callbacks are custom implemented because we want the output
-//arguments of the C++ vfuncs to be int& (not int*), and the vfunc_callback
-//functions may be called from gtk+ with a NULL pointer.
-void Widget_Class::get_preferred_width_vfunc_callback(GtkWidget* self, gint* minimum_width, gint*
natural_width)
-{
- const auto obj_base = static_cast<Glib::ObjectBase*>(
- Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
- // Non-gtkmmproc-generated custom classes implicitly call the default
- // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
- // generated classes can use this optimisation, which avoids the unnecessary
- // parameter conversions if there is no possibility of the virtual function
- // being overridden:
- if(obj_base && obj_base->is_derived_())
- {
- const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
- if(obj) // This can be NULL during destruction.
- {
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
- {
- // Call the virtual member method, which derived classes might override.
- int min_width = 0;
- int nat_width = 0;
- obj->get_preferred_width_vfunc(
- (minimum_width ? *minimum_width : min_width),
- (natural_width ? *natural_width : nat_width));
- return;
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- }
- }
-
- const auto base = static_cast<BaseClassType*>(
- g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
- );
-
- // Call the original underlying C function:
- if(base && base->get_preferred_width)
- (*base->get_preferred_width)(self, minimum_width, natural_width);
-}
-
-void Widget_Class::get_preferred_height_for_width_vfunc_callback(GtkWidget* self, gint width, gint*
minimum_height, gint* natural_height)
-{
- const auto obj_base = static_cast<Glib::ObjectBase*>(
- Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
- // Non-gtkmmproc-generated custom classes implicitly call the default
- // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
- // generated classes can use this optimisation, which avoids the unnecessary
- // parameter conversions if there is no possibility of the virtual function
- // being overridden:
- if(obj_base && obj_base->is_derived_())
- {
- const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
- if(obj) // This can be NULL during destruction.
- {
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
- {
- // Call the virtual member method, which derived classes might override.
- int min_height = 0;
- int nat_height = 0;
- obj->get_preferred_height_for_width_vfunc(width,
- (minimum_height ? *minimum_height : min_height),
- (natural_height ? *natural_height : nat_height));
- return;
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- }
- }
-
- const auto base = static_cast<BaseClassType*>(
- g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
- );
-
- // Call the original underlying C function:
- if(base && base->get_preferred_height_for_width)
- (*base->get_preferred_height_for_width)(self, width, minimum_height, natural_height);
-}
-
-void Widget_Class::get_preferred_height_vfunc_callback(GtkWidget* self, gint* minimum_height, gint*
natural_height)
-{
- const auto obj_base = static_cast<Glib::ObjectBase*>(
- Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
- // Non-gtkmmproc-generated custom classes implicitly call the default
- // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
- // generated classes can use this optimisation, which avoids the unnecessary
- // parameter conversions if there is no possibility of the virtual function
- // being overridden:
- if(obj_base && obj_base->is_derived_())
- {
- const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
- if(obj) // This can be NULL during destruction.
- {
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
- {
- // Call the virtual member method, which derived classes might override.
- int min_height = 0;
- int nat_height = 0;
- obj->get_preferred_height_vfunc(
- (minimum_height ? *minimum_height : min_height),
- (natural_height ? *natural_height : nat_height));
- return;
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- }
- }
-
- const auto base = static_cast<BaseClassType*>(
- g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
- );
-
- // Call the original underlying C function:
- if(base && base->get_preferred_height)
- (*base->get_preferred_height)(self, minimum_height, natural_height);
-}
-
-void Widget_Class::get_preferred_width_for_height_vfunc_callback(GtkWidget* self, gint height, gint*
minimum_width, gint* natural_width)
-{
- const auto obj_base = static_cast<Glib::ObjectBase*>(
- Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
- // Non-gtkmmproc-generated custom classes implicitly call the default
- // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
- // generated classes can use this optimisation, which avoids the unnecessary
- // parameter conversions if there is no possibility of the virtual function
- // being overridden:
- if(obj_base && obj_base->is_derived_())
- {
- const auto obj = dynamic_cast<CppObjectType* const>(obj_base);
- if(obj) // This can be NULL during destruction.
- {
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
- {
- // Call the virtual member method, which derived classes might override.
- int min_width = 0;
- int nat_width = 0;
- obj->get_preferred_width_for_height_vfunc(height,
- (minimum_width ? *minimum_width : min_width),
- (natural_width ? *natural_width : nat_width));
- return;
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- }
- }
-
- const auto base = static_cast<BaseClassType*>(
- g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
- );
-
- // Call the original underlying C function:
- if(base && base->get_preferred_width_for_height)
- (*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
-}
-
Widget::~Widget() noexcept
{}
@@ -425,15 +257,6 @@ void Widget::unset_name()
gtk_widget_set_name(gobj(), nullptr);
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Widget::unset_composite_name()
-{
- gtk_widget_set_composite_name(gobj(), nullptr);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif // GTKMM_DISABLE_DEPRECATED
-
void Widget::realize_if_needed()
{
if(!get_realized())
@@ -677,55 +500,6 @@ Glib::ustring Widget::drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>
return Gdk::AtomString::to_cpp_type(gtk_drag_dest_find_target(const_cast<GtkWidget*>(gobj()),
Glib::unwrap(context), nullptr /* See GTK+ docs */));
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Widget::draw_insertion_cursor(const Cairo::RefPtr<Cairo::Context>& cr, const Gdk::Rectangle& location,
bool is_primary, TextDirection direction, bool draw_arrow)
-{
- gtk_draw_insertion_cursor(gobj(), cr->cobj(), const_cast<GdkRectangle*>(location.gobj()), is_primary,
(GtkTextDirection)direction, draw_arrow);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif // GTKMM_DISABLE_DEPRECATED
-
-#ifndef GTKMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-Requisition Widget::get_requisition() const
-{
- Requisition result = {0, 0};
- gtk_widget_get_requisition(const_cast<GtkWidget*>(gobj()), &result);
- return result;
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif // GTKMM_DISABLE_DEPRECATED
-
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void Widget::unset_color(StateFlags state)
-{
- gtk_widget_override_color(gobj(), ((GtkStateFlags)(state)), nullptr);
-}
-
-void Widget::unset_background_color(StateFlags state)
-{
- gtk_widget_override_background_color(gobj(), ((GtkStateFlags)(state)), nullptr);
-}
-
-void Widget::unset_font()
-{
- gtk_widget_override_font(gobj(), nullptr);
-}
-
-void Widget::unset_symbolic_color(const Glib::ustring& name)
-{
- gtk_widget_override_symbolic_color(gobj(), name.c_str(), nullptr);
-}
-
-void Widget::unset_cursor()
-{
- gtk_widget_override_cursor(gobj(), nullptr, nullptr);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
-
void Widget::unset_font_options()
{
gtk_widget_set_font_options(gobj(), nullptr);
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 43b2766..668fb95 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -71,7 +71,6 @@ class Window;
class Container;
class Settings;
class Tooltip;
-class StockID; //deprecated.
// Gtk::Allocation is a typedef of Gdk::Rectangle because GtkAllocation is
// a typedef of GdkRectangle.
@@ -95,8 +94,7 @@ typedef Gdk::Rectangle Allocation;
* first be set with ().
*
* Only widgets with a Gdk::Window on the server side are allowed to
- * capture events. Widgets in the Gtk::Misc group for example lack
- * a Gdk::Window.
+ * capture events.
*/
class Widget
: public Object,
@@ -108,7 +106,7 @@ class Widget
_CLASS_GTKOBJECT(Widget,GtkWidget,GTK_WIDGET,Object,GObject)
_IMPLEMENTS_INTERFACE(Buildable)
_IMPLEMENTS_INTERFACE(Atk::Implementor, ifdef GTKMM_ATKMM_ENABLED)
- _IGNORE(gtk_widget_set_visual, gtk_widget_destroy, gtk_widget_destroyed, gtk_widget_hide_on_delete,
+ _IGNORE(gtk_widget_destroy, gtk_widget_destroyed, gtk_widget_hide_on_delete,
gtk_widget_style_get_valist, gtk_widget_list_accel_closures, gtk_widget_style_get)
public:
friend class Main;
@@ -133,8 +131,6 @@ public:
_WRAP_METHOD(void size_allocate(const Allocation& allocation, int baseline),
gtk_widget_size_allocate_with_baseline)
- _IGNORE(gtk_widget_size_request) //deprecated
-
_WRAP_METHOD(SizeRequestMode get_request_mode() const, gtk_widget_get_request_mode)
_WRAP_METHOD(void get_preferred_width(int& minimum_width, int& natural_width) const,
gtk_widget_get_preferred_width)
_WRAP_METHOD(void get_preferred_height_for_width(int width, int& minimum_height, int& natural_height)
const, gtk_widget_get_preferred_height_for_width)
@@ -162,8 +158,6 @@ public:
//TODO: Use C++ type
_WRAP_METHOD(bool event(GdkEvent* gdk_event), gtk_widget_event)
- _WRAP_METHOD(int send_expose(GdkEvent* gdk_event), gtk_widget_send_expose,
- deprecated "%Application and widget code should not handle expose events directly; invalidation should
use the Gtk::Widget API, and drawing should only happen inside signal_draw() implementations.")
_WRAP_METHOD(bool send_focus_change(GdkEvent* gdk_event), gtk_widget_send_focus_change)
_WRAP_METHOD(bool activate(), gtk_widget_activate)
@@ -175,16 +169,10 @@ public:
* @param new_parent A Gtk::Container to move the widget into.
*/
void reparent(Widget& new_parent);
- _IGNORE(gtk_widget_reparent)
bool intersect(const Gdk::Rectangle& area) const;
_WRAP_METHOD(bool intersect(const Gdk::Rectangle& area, Gdk::Rectangle& intersection) const,
gtk_widget_intersect)
-#m4 _CONVERSION(`cairo_region_t*',`::Cairo::RefPtr< ::Cairo::Region>',`::Cairo::RefPtr< ::Cairo::Region>(new
::Cairo::Region($3, true /* do not take ref */))')
-
- _WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Region> region_intersect(const ::Cairo::RefPtr< ::Cairo::Region>&
region) const, gtk_widget_region_intersect,
- deprecated "Use get_allocation() and Cairo::Region::intersect(const Cairo::RectangleInt&) to
get the same behavior.")
-
_WRAP_METHOD(void freeze_child_notify(), gtk_widget_freeze_child_notify)
_WRAP_METHOD(void child_notify(const Glib::ustring& child_property), gtk_widget_child_notify)
_WRAP_METHOD(void thaw_child_notify(), gtk_widget_thaw_child_notify)
@@ -229,9 +217,6 @@ public:
void unset_name();
_WRAP_METHOD(Glib::ustring get_name() const, gtk_widget_get_name)
- _WRAP_METHOD(void set_state(StateType state), gtk_widget_set_state, deprecated "Use set_state_flags()
instead.")
- _WRAP_METHOD(StateType get_state() const, gtk_widget_get_state, deprecated "Use get_state_flags()
instead.")
-
_WRAP_METHOD(void set_state_flags(StateFlags flags, bool clear = true), gtk_widget_set_state_flags)
_WRAP_METHOD(void unset_state_flags(StateFlags flags), gtk_widget_unset_state_flags)
_WRAP_METHOD(StateFlags get_state_flags() const, gtk_widget_get_state_flags)
@@ -249,10 +234,6 @@ public:
_WRAP_METHOD(bool get_mapped() const, gtk_widget_get_mapped)
_WRAP_METHOD(void set_app_paintable(bool app_paintable = true), gtk_widget_set_app_paintable)
_WRAP_METHOD(bool get_app_paintable() const, gtk_widget_get_app_paintable)
- _WRAP_METHOD(void set_double_buffered(bool double_buffered = true), gtk_widget_set_double_buffered,
- deprecated "This does not work under non-X11 backends, and it should not be used in newly written code.")
- _WRAP_METHOD(bool get_double_buffered() const, gtk_widget_get_double_buffered,
- deprecated "This should not be used in newly written code.")
_WRAP_METHOD(void set_redraw_on_allocate(bool redraw_on_allocate = true),
gtk_widget_set_redraw_on_allocate)
@@ -340,9 +321,6 @@ public:
_WRAP_METHOD(Widget* get_ancestor(GType widget_type), gtk_widget_get_ancestor)
_WRAP_METHOD(const Widget* get_ancestor(GType widget_type) const, gtk_widget_get_ancestor, constversion)
-
- _WRAP_METHOD(Glib::RefPtr<Gdk::Visual> get_visual(), gtk_widget_get_visual, refreturn)
-
_WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_widget_get_screen, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_widget_get_screen, refreturn,
constversion)
@@ -353,9 +331,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Display> get_display(), gtk_widget_get_display, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Display> get_display() const, gtk_widget_get_display, refreturn,
constversion)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_root_window(), gtk_widget_get_root_window, refreturn,
deprecated "Use Gdk::Screen::get_root_window() instead.")
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_root_window() const, gtk_widget_get_root_window,
refreturn, constversion, deprecated "Use Gdk::Screen::get_root_window() instead.")
-
_WRAP_METHOD(Glib::RefPtr<Settings> get_settings(), gtk_widget_get_settings, refreturn)
_WRAP_METHOD(Glib::RefPtr<Clipboard> get_clipboard(const Glib::ustring& selection),
gtk_widget_get_clipboard, refreturn)
@@ -383,10 +358,6 @@ public:
_WRAP_METHOD(Align get_valign() const, gtk_widget_get_valign)
_WRAP_METHOD(Align get_valign_with_baseline() const, gtk_widget_get_valign_with_baseline)
_WRAP_METHOD(void set_valign(Align align), gtk_widget_set_valign)
- _WRAP_METHOD(int get_margin_left() const, gtk_widget_get_margin_left, deprecated "Use get_margin_start()
instead.")
- _WRAP_METHOD(void set_margin_left(int margin), gtk_widget_set_margin_left, deprecated "Use
set_margin_start() instead.")
- _WRAP_METHOD(int get_margin_right() const, gtk_widget_get_margin_right, deprecated "Use get_margin_end()
instead.")
- _WRAP_METHOD(void set_margin_right(int margin), gtk_widget_set_margin_right, deprecated "Use
set_margin_end() instead.")
_WRAP_METHOD(int get_margin_start() const, gtk_widget_get_margin_start)
_WRAP_METHOD(void set_margin_start(int margin), gtk_widget_set_margin_start)
_WRAP_METHOD(int get_margin_end() const, gtk_widget_get_margin_end)
@@ -398,86 +369,12 @@ public:
_WRAP_METHOD(Gdk::EventMask get_events() const, gtk_widget_get_events)
_WRAP_METHOD(Gdk::EventMask get_device_events(const Glib::RefPtr<const Gdk::Device>& device) const,
gtk_widget_get_device_events)
- _WRAP_METHOD(void get_pointer(int &x, int &y) const, gtk_widget_get_pointer, deprecated "Use
Gdk::Window::get_device_position instead.")
_WRAP_METHOD(bool is_ancestor(Widget &ancestor) const, gtk_widget_is_ancestor)
_WRAP_METHOD(bool translate_coordinates(Widget& dest_widget,
int src_x, int src_y,
int& dest_x, int& dest_y), gtk_widget_translate_coordinates)
- _IGNORE(gtk_widget_set_style, gtk_widget_get_style, gtk_widget_has_rc_style, gtk_widget_ensure_style,
- gtk_widget_modify_style, gtk_widget_get_modifier_style,
- gtk_widget_reset_rc_styles) //deprecated broadly in favour of StyleContext.;
-
- _WRAP_METHOD(void override_color(const Gdk::RGBA& color{.}, StateFlags state{.} = STATE_FLAG_NORMAL),
gtk_widget_override_color,
- deprecated "Use a custom style provider and style classes instead.")
-
-_DEPRECATE_IFDEF_START
- /** Undoes the effect of previous calls to override_color().
- *
- * @newin{3,0}
- * @deprecated Use a custom style provider and style classes instead.
- *
- * @param state The state for which to use the color of the user's theme.
- */
- void unset_color(StateFlags state = STATE_FLAG_NORMAL);
-_DEPRECATE_IFDEF_END
-
- _WRAP_METHOD(void override_background_color(const Gdk::RGBA& color{.}, StateFlags state{.} =
STATE_FLAG_NORMAL), gtk_widget_override_background_color,
- deprecated "Use a custom style provider and style classes instead.")
-
-_DEPRECATE_IFDEF_START
- /** Undoes the effect of previous calls to override_background_color().
- *
- * @newin{3,0}
- * @deprecated Use a custom style provider and style classes instead.
- *
- * @param state The state for which to use the background color of the user's theme.
- */
- void unset_background_color(StateFlags state = STATE_FLAG_NORMAL);
-_DEPRECATE_IFDEF_END
-
- _WRAP_METHOD(void override_font(const Pango::FontDescription& font_desc), gtk_widget_override_font,
- deprecated "Use a custom style provider and style classes instead.")
-
-_DEPRECATE_IFDEF_START
- /** Undoes the effect of previous calls to override_font().
- *
- * @newin{3,0}
- * @deprecated Use a custom style provider and style classes instead.
- */
- void unset_font();
-_DEPRECATE_IFDEF_END
-
- _WRAP_METHOD(void override_symbolic_color(const Glib::ustring& name, const Gdk::RGBA& color),
gtk_widget_override_symbolic_color,
- deprecated "Use a custom style provider and style classes instead.")
-
-_DEPRECATE_IFDEF_START
- /** Undoes the effect of previous calls to override_symbolic_color().
- *
- * @newin{3,0}
- * @deprecated Use a custom style provider and style classes instead.
- *
- * @param name The name of the symbolic color to fetch from the user's theme.
- */
- void unset_symbolic_color(const Glib::ustring& name);
-_DEPRECATE_IFDEF_END
-
- _WRAP_METHOD(void override_cursor(const Gdk::RGBA& cursor, const Gdk::RGBA& secondary_cursor),
gtk_widget_override_cursor,
- deprecated "Use a custom style provider and style classes instead.")
-
-_DEPRECATE_IFDEF_START
- /** Undoes the effect of previous calls to override_cursor().
- *
- * @newin{3,0}
- * @deprecated Use a custom style provider and style classes instead.
- */
- void unset_cursor();
-_DEPRECATE_IFDEF_END
-
- _IGNORE(gtk_widget_modify_fg, gtk_widget_modify_bg, gtk_widget_modify_font, gtk_widget_modify_text,
- gtk_widget_modify_base, gtk_widget_modify_cursor) //deprecated
-
_WRAP_METHOD(void reset_style(), gtk_widget_reset_style)
//The parameter name is "the_property_name" to avoid a warning because there is a method with the
"property_name" name.
@@ -503,20 +400,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(Glib::RefPtr<Pango::Layout> create_pango_layout(const Glib::ustring& text),
gtk_widget_create_pango_layout)
- _IGNORE(gtk_widget_render_icon) //deprecated.
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> render_icon_pixbuf(const StockID& stock_id, IconSize size),
gtk_widget_render_icon_pixbuf, deprecated "Use IconTheme::load_icon() instead.")
-
- _WRAP_METHOD(void set_composite_name(const Glib::ustring& name), gtk_widget_set_composite_name, deprecated
"Use gtk_widget_class_set_template(), or don't use this API at all.")
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** @deprecated Use gtk_widget_class_set_template(), or don't use this API at all.
- */
- void unset_composite_name();
-#endif // GTKMM_DISABLE_DEPRECATED
- _WRAP_METHOD(Glib::ustring get_composite_name() const, gtk_widget_get_composite_name, deprecated "Use
gtk_widget_class_set_template(), or don't use this API at all.")
-
- _WRAP_METHOD(static void push_composite_child(), gtk_widget_push_composite_child, deprecated "This API
never really worked well and was mostly unused, now we have a more complete mechanism for composite children,
see gtk_widget_class_set_template().")
- _WRAP_METHOD(static void pop_composite_child(), gtk_widget_pop_composite_child, deprecated "Use
gtk_widget_class_set_template(), or don't use this API at all.")
-
/* Directionality of Text */
_WRAP_METHOD(void set_direction(TextDirection dir), gtk_widget_set_direction)
@@ -529,7 +412,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void input_shape_combine_region(const ::Cairo::RefPtr<const ::Cairo::Region>& region),
gtk_widget_input_shape_combine_region)
_WRAP_METHOD(WidgetPath get_path() const, gtk_widget_get_path)
- _IGNORE(gtk_widget_path, gtk_widget_class_path) //deprecated
#m4 _CONVERSION(`GList*',`std::vector<Widget*>',`Glib::ListHandler<Widget*>::list_to_vector($3,
Glib::OWNERSHIP_SHALLOW)')
_WRAP_METHOD(std::vector<Widget*> list_mnemonic_labels(), gtk_widget_list_mnemonic_labels)
@@ -549,7 +431,6 @@ _DEPRECATE_IFDEF_END
void drag_dest_set(const std::vector<TargetEntry>& targets, DestDefaults flags = DEST_DEFAULT_ALL,
Gdk::DragAction actions = Gdk::ACTION_COPY);
_IGNORE(gtk_drag_dest_set)
- _WRAP_METHOD(void drag_dest_set_proxy(const Glib::RefPtr<Gdk::Window>& proxy_window, Gdk::DragProtocol
protocol, bool use_coordinates), gtk_drag_dest_set_proxy)
_WRAP_METHOD(void drag_dest_unset(), gtk_drag_dest_unset)
_WRAP_METHOD(Glib::ustring drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>& context, const
Glib::RefPtr<TargetList>& target_list) const, gtk_drag_dest_find_target)
Glib::ustring drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>& context) const;
@@ -568,15 +449,12 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void drag_source_unset(), gtk_drag_source_unset)
_WRAP_METHOD(void drag_source_set_icon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf),
gtk_drag_source_set_icon_pixbuf)
- _WRAP_METHOD(void drag_source_set_icon(const StockID& stock_id), gtk_drag_source_set_icon_stock,
deprecated "Use the drag_source_set_icon() that takes a Glib::ustring instead.")
_WRAP_METHOD(void drag_source_set_icon(const Glib::ustring& icon_name), gtk_drag_source_set_icon_name)
_WRAP_METHOD(void drag_source_add_text_targets(), gtk_drag_source_add_text_targets)
_WRAP_METHOD(void drag_source_add_uri_targets(), gtk_drag_source_add_uri_targets)
_WRAP_METHOD(void drag_source_add_image_targets(), gtk_drag_source_add_image_targets)
- _WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets,
Gdk::DragAction actions, int button, GdkEvent* gdk_event), gtk_drag_begin, refreturn,
- deprecated "Use the drag_begin() that takes x,y coordinates.")
_WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets,
Gdk::DragAction actions, int button, GdkEvent* gdk_event, int x, int y), gtk_drag_begin_with_coordinates,
refreturn)
_WRAP_METHOD(bool drag_check_threshold(int start_x, int start_y, int current_x, int current_y),
gtk_drag_check_threshold)
@@ -598,17 +476,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(void map(), gtk_widget_map)
_WRAP_METHOD(void unmap(), gtk_widget_unmap)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** Draws a text caret on @a cr at @a location.
- * This is not a style function but merely a convenience function for drawing
- * the standard cursor shape.
- *
- * @deprecated Use StyleContext::render_insertion_cursor() instead.
- */
- void draw_insertion_cursor(const ::Cairo::RefPtr< ::Cairo::Context>& cr, const Gdk::Rectangle& location,
bool is_primary, TextDirection direction, bool draw_arrow = true);
-#endif // GTKMM_DISABLE_DEPRECATED
- _IGNORE(gtk_draw_insertion_cursor)
-
// Gtk+ 2.12 tooltip API
_WRAP_METHOD(void set_tooltip_window(Window& custom_window), gtk_widget_set_tooltip_window)
_WRAP_METHOD(Window* get_tooltip_window(), gtk_widget_get_tooltip_window)
@@ -688,8 +555,6 @@ _DEPRECATE_IFDEF_END
// and style_set => style_changed
// to avoid confusion with set_parent and set_style.
- _WRAP_SIGNAL(void state_changed(Gtk::StateType previous_state), "state_changed", deprecated "Use
signal_state_flags_changed() instead.")
-
//TODO: Remove no_default_handler when we can break ABI:
_WRAP_SIGNAL(void state_flags_changed(Gtk::StateFlags previous_state_flags), "state-flags-changed",
no_default_handler)
@@ -700,7 +565,6 @@ _DEPRECATE_IFDEF_END
_WRAP_SIGNAL(void hierarchy_changed(Widget* previous_toplevel), "hierarchy_changed")
- _IGNORE_SIGNAL("style_set") //uses deprecated GtkStyle.
_WRAP_SIGNAL(void style_updated(), "style_updated")
_WRAP_SIGNAL(void direction_changed(TextDirection direction), "direction_changed")
@@ -767,8 +631,6 @@ dnl
_WRAP_SIGNAL(bool selection_notify_event(GdkEventSelection* selection_event), "selection_notify_event")
_WRAP_SIGNAL(bool proximity_in_event(GdkEventProximity* proximity_event), "proximity_in_event")
_WRAP_SIGNAL(bool proximity_out_event(GdkEventProximity* proximity_event), "proximity_out_event")
- _WRAP_SIGNAL(bool visibility_notify_event(GdkEventVisibility* visibility_event), "visibility_notify_event",
- deprecated "Modern composited windowing systems with pervasive transparency make it impossible to track
the visibility of a window reliably, so this signal can not be guaranteed to provide useful information.")
_WRAP_SIGNAL(bool window_state_event(GdkEventWindowState* window_state_event), "window_state_event")
//We use the optional custom_c_callback parameter with _WRAP_SIGNAL() for some of these,
@@ -832,20 +694,15 @@ _CONVERSION(`GdkScreen*',`const Glib::RefPtr<Gdk::Screen>&',`Glib::wrap($3, true
_WRAP_PROPERTY("can_default", bool)
_WRAP_PROPERTY("has_default", bool)
_WRAP_PROPERTY("receives_default", bool)
- _WRAP_PROPERTY("composite_child", bool)
- _WRAP_PROPERTY("style", Glib::RefPtr<Style>, deprecated "Don't use this API. There is no Style class in
gtkmm 3.")
_WRAP_PROPERTY("events", Gdk::EventMask)
_WRAP_PROPERTY("has_tooltip", bool)
_WRAP_PROPERTY("tooltip_markup", Glib::ustring)
_WRAP_PROPERTY("tooltip_text", Glib::ustring)
_WRAP_PROPERTY("window", Glib::RefPtr<Gdk::Window>)
_WRAP_PROPERTY("no-show-all", bool)
- _WRAP_PROPERTY("double-buffered", bool, deprecated "Widgets should not use this property.")
_WRAP_PROPERTY("halign", Align)
_WRAP_PROPERTY("valign", Align)
- _WRAP_PROPERTY("margin-left", int, deprecated "Use property_margin_start() instead.")
- _WRAP_PROPERTY("margin-right", int, deprecated "Use property_margin_end() instead.")
_WRAP_PROPERTY("margin-start", int)
_WRAP_PROPERTY("margin-end", int)
_WRAP_PROPERTY("margin-top", int)
@@ -868,10 +725,6 @@ protected:
_WRAP_VFUNC(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", refreturn, ifdef
GTKMM_ATKMM_ENABLED)
_WRAP_VFUNC(SizeRequestMode get_request_mode() const, get_request_mode)
- _WRAP_VFUNC(void get_preferred_width(int& minimum_width, int& natural_width) const, get_preferred_width,
custom_vfunc_callback)
- _WRAP_VFUNC(void get_preferred_height_for_width(int width, int& minimum_height, int& natural_height)
const, get_preferred_height_for_width, custom_vfunc_callback)
- _WRAP_VFUNC(void get_preferred_height(int& minimum_height, int& natural_height) const,
get_preferred_height, custom_vfunc_callback)
- _WRAP_VFUNC(void get_preferred_width_for_height(int height, int& minimum_width, int& natural_width) const,
get_preferred_width_for_height, custom_vfunc_callback)
//TODO: Wrap all the new vfuncs when we can break ABI.
protected:
@@ -927,28 +780,6 @@ protected:
void transform_cairo_context_to_window(const ::Cairo::RefPtr< ::Cairo::Context>& cr, const
Glib::RefPtr<const Gdk::Window>& window);
_IGNORE(gtk_cairo_transform_to_window)
-#ifndef GTKMM_DISABLE_DEPRECATED
- /** 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.
- *
- * @newin{2,20}
- * @deprecated Use get_preferred_size() instead.
- */
- Requisition get_requisition() const;
- _IGNORE(gtk_widget_get_requisition)
-#endif // GTKMM_DISABLE_DEPRECATED
-
- _IGNORE(gtk_widget_style_attach) //deprecated
- _IGNORE(gtk_widget_get_child_requisition) //deprecated.
-
//The parameter name is "the_property_name" to avoid a warning because there is a method with the
"property_name" name.
/** Gets the value of a style property of @a widget.
*
diff --git a/gtk/src/widgetpath.hg b/gtk/src/widgetpath.hg
index ac54d19..d94113b 100644
--- a/gtk/src/widgetpath.hg
+++ b/gtk/src/widgetpath.hg
@@ -70,15 +70,6 @@ public:
_WRAP_METHOD(bool iter_has_class(int pos, const Glib::ustring& name) const, gtk_widget_path_iter_has_class)
//TODOL_WRAP_METHOD(bool iter_has_qclass(int pos, GQuark qname) const, gtk_widget_path_iter_has_qclass)
- _WRAP_METHOD(void iter_add_region(int pos, const Glib::ustring& name, RegionFlags flags),
gtk_widget_path_iter_add_region, deprecated "The use of regions is deprecated.")
- _WRAP_METHOD(void iter_remove_region(int pos, const Glib::ustring& name),
gtk_widget_path_iter_remove_region, deprecated "The use of regions is deprecated.")
- _WRAP_METHOD(void iter_clear_regions(int pos = -1), gtk_widget_path_iter_clear_regions, deprecated "The
use of regions is deprecated.")
-
- _WRAP_METHOD(std::vector<Glib::ustring> iter_list_regions(int pos = -1) const,
gtk_widget_path_iter_list_regions, deprecated "The use of regions is deprecated.")
-
- _WRAP_METHOD(bool iter_has_region(int pos, const Glib::ustring& name, RegionFlags& flags) const,
gtk_widget_path_iter_has_region, deprecated "The use of regions is deprecated.")
- _IGNORE(gtk_widget_path_iter_has_qregion) //deprecated
-
_WRAP_METHOD(GType get_object_type() const, gtk_widget_path_get_object_type)
_WRAP_METHOD(bool is_type(GType type) const, gtk_widget_path_is_type)
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 085a221..7a71720 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -203,17 +203,4 @@ void Window::unset_application()
gtk_window_set_application(gobj(), nullptr /* See GTK+ docs */);
}
-#ifndef GTKMM_DISABLE_DEPRECATED
-// This works. The base class GtkWidget contains the opacity property.
-Glib::PropertyProxy< double > Window::property_opacity()
-{
- return Glib::PropertyProxy< double >(this, "opacity");
-}
-
-Glib::PropertyProxy_ReadOnly< double > Window::property_opacity() const
-{
- return Glib::PropertyProxy_ReadOnly< double >(this, "opacity");
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
} // namespace Gtk
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index b52fb97..d10615e 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -76,30 +76,6 @@ public:
_WRAP_PROPERTY("gravity", Gdk::Gravity)
_WRAP_PROPERTY("transient_for", Window*)
-#ifndef GTKMM_DISABLE_DEPRECATED
-// _WRAP_PROPERTY("opacity", double, deprecated "Use the opacity property in the Widget base class instead.")
-// The GtkWindow::opacity property does not exist in gtk+ 3.7.10 and later. Must hand-code to avoid an ABI
break.
-/** The opacity of the window, from 0 to 1.
- * @deprecated Use the opacity property in the Widget base class instead.
- *
- * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
- * @return A PropertyProxy that allows you to get or set the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy< double > property_opacity() ;
-
-/** The opacity of the window, from 0 to 1.
- * @deprecated Use the opacity property in the Widget base class instead.
- *
- * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
- * @return A PropertyProxy_ReadOnly that allows you to get the value of the property,
- * or receive notification when the value of the property changes.
- */
- Glib::PropertyProxy_ReadOnly< double > property_opacity() const;
-#endif // GTKMM_DISABLE_DEPRECATED
-
- _WRAP_PROPERTY("has-resize-grip", bool, deprecated "Resize grips have been removed.")
- _WRAP_PROPERTY("resize-grip-visible", bool, deprecated "Resize grips have been removed.")
_WRAP_PROPERTY("urgency_hint", bool)
_WRAP_PROPERTY("accept-focus", bool)
_WRAP_PROPERTY("focus-on-map", bool)
@@ -137,10 +113,6 @@ dnl
_WRAP_METHOD(Glib::ustring get_title() const, gtk_window_get_title)
- _WRAP_METHOD(void set_wmclass(const Glib::ustring& wmclass_name,
- const Glib::ustring& wmclass_class),
- gtk_window_set_wmclass)
-
_WRAP_METHOD(void set_role(const Glib::ustring& role), gtk_window_set_role)
_WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gtk_window_set_startup_id)
@@ -194,9 +166,6 @@ dnl
_WRAP_METHOD(Widget* get_attached_to(), gtk_window_get_attached_to)
_WRAP_METHOD(const Widget* get_attached_to() const, gtk_window_get_attached_to, constversion)
- _WRAP_METHOD(void set_opacity(double opacity), gtk_window_set_opacity, deprecated "Use
Widget::set_opacity() instead.")
- _WRAP_METHOD(double get_opacity() const, gtk_window_get_opacity, deprecated "Use Widget::get_opacity()
instead.")
-
_WRAP_METHOD(void set_type_hint(Gdk::WindowTypeHint hint), gtk_window_set_type_hint)
_WRAP_METHOD(Gdk::WindowTypeHint get_type_hint() const, gtk_window_get_type_hint)
@@ -238,11 +207,6 @@ dnl
_WRAP_METHOD(Gdk::Gravity get_gravity() const, gtk_window_get_gravity)
- _WRAP_METHOD(void set_geometry_hints(Widget& geometry_widget,
- const Gdk::Geometry& geometry,
- Gdk::WindowHints geom_mask),
- gtk_window_set_geometry_hints)
-
_WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_window_set_screen)
_WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_window_get_screen, refreturn)
@@ -354,13 +318,6 @@ dnl
_WRAP_METHOD(void get_position(int& root_x, int& root_y) const,
gtk_window_get_position)
- _WRAP_METHOD(bool parse_geometry(const Glib::ustring& geometry), gtk_window_parse_geometry,
- deprecated "Geometry handling in GTK is deprecated.")
- _WRAP_METHOD(void set_default_geometry(int width, int height), gtk_window_set_default_geometry,
- deprecated "This function does nothing. If you want to set a default size, use set_default_size()
instead.")
- _WRAP_METHOD(void resize_to_geometry(int width, int height), gtk_window_resize_to_geometry,
- deprecated "This function does nothing. Use resize() and compute the geometry yourself.")
-
_WRAP_METHOD(Glib::RefPtr<WindowGroup> get_group(), gtk_window_get_group, refreturn)
_WRAP_METHOD(Glib::RefPtr<const WindowGroup> get_group() const, gtk_window_get_group, refreturn,
constversion)
@@ -368,9 +325,6 @@ dnl
_WRAP_METHOD(WindowType get_window_type() const, gtk_window_get_window_type)
- _WRAP_METHOD(void reshow_with_initial_size(), gtk_window_reshow_with_initial_size,
- deprecated "GUI builders can call Widget::hide(), Widget::unrealize() and then Widget::show()
themselves, if they still need this functionality.")
-
_WRAP_METHOD(Glib::RefPtr<Application> get_application(), gtk_window_get_application, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Application> get_application() const, gtk_window_get_application,
refreturn)
@@ -381,12 +335,6 @@ dnl
*/
void unset_application();
- _WRAP_METHOD(void set_has_resize_grip(bool value = true), gtk_window_set_has_resize_grip, deprecated
"Resize grips have been removed.")
- _WRAP_METHOD(bool get_has_resize_grip() const, gtk_window_get_has_resize_grip, deprecated "Resize grips
have been removed.")
-
- _WRAP_METHOD(bool get_resize_grip_is_visible() const, gtk_window_resize_grip_is_visible, deprecated
"Resize grips have been removed.")
- _WRAP_METHOD(bool get_resize_grip_area(Gdk::Rectangle& rect) const, gtk_window_get_resize_grip_area,
deprecated "Resize grips have been removed.")
-
_WRAP_METHOD(void set_keep_above(bool setting = true), gtk_window_set_keep_above)
_WRAP_METHOD(void set_keep_below(bool setting = true), gtk_window_set_keep_below)
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 45cd00d..d8a13a6 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -32,10 +32,6 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#ifdef GDK_WINDOWING_X11
-#include <gtk/gtkx.h>
-#endif
-
#ifndef G_OS_WIN32
# include <gtk/gtkunixprint.h>
#endif
@@ -49,20 +45,15 @@ int main(int argc, char** argv)
std::cout << get_defs( GTK_TYPE_ABOUT_DIALOG )
<< get_defs( GTK_TYPE_ACCEL_GROUP )
<< get_defs( GTK_TYPE_ACCEL_LABEL )
- << get_defs( GTK_TYPE_ACTION )
- << get_defs( GTK_TYPE_ACTION_GROUP )
<< get_defs( GTK_TYPE_ACTIONABLE )
<< get_defs( GTK_TYPE_ACTION_BAR )
- << get_defs( GTK_TYPE_ACTIVATABLE )
<< get_defs( GTK_TYPE_ADJUSTMENT )
- << get_defs( GTK_TYPE_ALIGNMENT)
<< get_defs( GTK_TYPE_APP_CHOOSER )
<< get_defs( GTK_TYPE_APP_CHOOSER_BUTTON )
<< get_defs( GTK_TYPE_APP_CHOOSER_DIALOG )
<< get_defs( GTK_TYPE_APP_CHOOSER_WIDGET )
<< get_defs( GTK_TYPE_APPLICATION )
<< get_defs( GTK_TYPE_APPLICATION_WINDOW )
- << get_defs( GTK_TYPE_ARROW )
<< get_defs( GTK_TYPE_ASPECT_FRAME )
<< get_defs( GTK_TYPE_ASSISTANT )
<< get_defs( GTK_TYPE_BIN )
@@ -93,8 +84,6 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_COLOR_BUTTON )
<< get_defs( GTK_TYPE_COLOR_CHOOSER )
<< get_defs( GTK_TYPE_COLOR_CHOOSER_DIALOG )
- << get_defs( GTK_TYPE_COLOR_SELECTION )
- << get_defs( GTK_TYPE_COLOR_SELECTION_DIALOG )
<< get_defs( GTK_TYPE_COMBO_BOX )
<< get_defs( GTK_TYPE_CONTAINER )
<< get_defs( GTK_TYPE_CELL_VIEW )
@@ -120,8 +109,6 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_FONT_CHOOSER )
<< get_defs( GTK_TYPE_FONT_CHOOSER_DIALOG )
<< get_defs( GTK_TYPE_FONT_CHOOSER_WIDGET )
- << get_defs( GTK_TYPE_FONT_SELECTION )
- << get_defs( GTK_TYPE_FONT_SELECTION_DIALOG )
<< get_defs( GTK_TYPE_FRAME )
<< get_defs( GTK_TYPE_GESTURE )
<< get_defs( GTK_TYPE_GESTURE_DRAG )
@@ -134,11 +121,9 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_GESTURE_ZOOM )
<< get_defs( GTK_TYPE_GL_AREA )
<< get_defs( GTK_TYPE_GRID )
- << get_defs( GTK_TYPE_HANDLE_BOX )
<< get_defs( GTK_TYPE_HEADER_BAR )
<< get_defs( GTK_TYPE_ICON_THEME )
<< get_defs( GTK_TYPE_IMAGE )
- << get_defs( GTK_TYPE_IMAGE_MENU_ITEM )
<< get_defs( GTK_TYPE_INFO_BAR )
<< get_defs( GTK_TYPE_INVISIBLE )
<< get_defs( GTK_TYPE_ICON_VIEW )
@@ -156,18 +141,12 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_MENU_SHELL )
<< get_defs( GTK_TYPE_MENU_TOOL_BUTTON )
<< get_defs( GTK_TYPE_MESSAGE_DIALOG )
- << get_defs( GTK_TYPE_MISC )
<< get_defs( GTK_TYPE_MODEL_BUTTON )
<< get_defs( GTK_TYPE_NOTEBOOK )
- << get_defs( GTK_TYPE_NUMERABLE_ICON )
- << get_defs( GTK_TYPE_OFFSCREEN_WINDOW )
<< get_defs( GTK_TYPE_ORIENTABLE )
<< get_defs( GTK_TYPE_OVERLAY )
<< get_defs( GTK_TYPE_PANED )
<< get_defs( GTK_TYPE_PLACES_SIDEBAR )
-#ifdef GDK_WINDOWING_X11
- << get_defs( GTK_TYPE_PLUG )
-#endif
<< get_defs( GTK_TYPE_POPOVER )
<< get_defs( GTK_TYPE_POPOVER_MENU )
#if !defined(G_OS_WIN32)
@@ -185,10 +164,8 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_PROGRESS_BAR )
<< get_defs( GTK_TYPE_RADIO_BUTTON )
<< get_defs( GTK_TYPE_RADIO_TOOL_BUTTON )
- << get_defs( GTK_TYPE_RADIO_ACTION )
<< get_defs( GTK_TYPE_RADIO_MENU_ITEM )
<< get_defs( GTK_TYPE_RANGE )
- << get_defs( GTK_TYPE_RECENT_ACTION )
<< get_defs( GTK_TYPE_RECENT_CHOOSER )
<< get_defs( GTK_TYPE_RECENT_CHOOSER_MENU )
<< get_defs( GTK_TYPE_RECENT_CHOOSER_WIDGET )
@@ -211,21 +188,15 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_SHORTCUTS_SHORTCUT )
<< get_defs( GTK_TYPE_SHORTCUTS_WINDOW )
<< get_defs( GTK_TYPE_SIZE_GROUP )
-#ifdef GDK_WINDOWING_X11
- << get_defs( GTK_TYPE_SOCKET )
-#endif
<< get_defs( GTK_TYPE_SPINNER )
<< get_defs( GTK_TYPE_SPIN_BUTTON )
<< get_defs( GTK_TYPE_STACK )
<< get_defs( GTK_TYPE_STACK_SIDEBAR )
<< get_defs( GTK_TYPE_STACK_SWITCHER )
<< get_defs( GTK_TYPE_STATUSBAR )
- << get_defs( GTK_TYPE_STATUS_ICON )
<< get_defs( GTK_TYPE_STYLE_CONTEXT )
<< get_defs( GTK_TYPE_STYLE_PROVIDER )
<< get_defs( GTK_TYPE_SWITCH )
- << get_defs( GTK_TYPE_TABLE )
- << get_defs( GTK_TYPE_TEAROFF_MENU_ITEM )
<< get_defs( GTK_TYPE_TOGGLE_BUTTON )
<< get_defs( GTK_TYPE_TOOLBAR )
<< get_defs( GTK_TYPE_TOOL_ITEM )
@@ -237,7 +208,6 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_TEXT_TAG )
<< get_defs( GTK_TYPE_TEXT_TAG_TABLE )
<< get_defs( GTK_TYPE_TEXT_VIEW )
- << get_defs( GTK_TYPE_TOGGLE_ACTION )
<< get_defs( GTK_TYPE_TOGGLE_TOOL_BUTTON )
<< get_defs( GTK_TYPE_TOOLTIP )
<< get_defs( GTK_TYPE_TREE_SELECTION )
@@ -249,7 +219,6 @@ int main(int argc, char** argv)
<< get_defs( GTK_TYPE_TREE_STORE )
<< get_defs( GTK_TYPE_TREE_VIEW )
<< get_defs( GTK_TYPE_TREE_VIEW_COLUMN )
- << get_defs( GTK_TYPE_UI_MANAGER )
<< get_defs( GTK_TYPE_VIEWPORT )
<< get_defs( GTK_TYPE_VOLUME_BUTTON )
<< get_defs( GTK_TYPE_WIDGET )
@@ -270,9 +239,6 @@ int main(int argc, char** argv)
<< get_child_properties( GTK_TYPE_NOTEBOOK )
<< get_child_properties( GTK_TYPE_OVERLAY )
<< get_child_properties( GTK_TYPE_POPOVER_MENU )
-#ifdef GDK_WINDOWING_X11
- << get_child_properties( GTK_TYPE_SOCKET )
-#endif
<< get_child_properties( GTK_TYPE_STACK )
<< get_child_properties( GTK_TYPE_TEXT_VIEW )
<< get_child_properties( GTK_TYPE_TOOLBAR )
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 1b95676..1d2a0f2 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -68,7 +68,6 @@ _CONVERSION(`guint',`ui_merge_id',`$3')
_CONV_ENUM(Gtk,AccelFlags)
_CONV_ENUM(Gtk,Align)
_CONV_ENUM(Gtk,ArrowType)
-_CONV_ENUM(Gtk,AttachOptions)
_CONV_ENUM(Gtk,ButtonBoxStyle)
_CONV_ENUM(Gtk,ButtonRole)
_CONV_ENUM(Gtk,ButtonsType)
@@ -83,7 +82,6 @@ _CONV_ENUM(Gtk,DeleteType)
_CONV_ENUM(Gtk,DestDefaults)
_CONV_ENUM(Gtk,DirectionType)
_CONV_ENUM(Gtk,EventSequenceState)
-_CONV_ENUM(Gtk,ExpanderStyle)
_CONV_ENUM(Gtk,ImageType)
_CONV_ENUM(Gtk,Justification)
_CONV_ENUM(Gtk,License)
@@ -104,7 +102,6 @@ _CONV_ENUM(Gtk,ProgressBarOrientation)
_CONV_ENUM(Gtk,ProgressBarStyle)
_CONV_ENUM(Gtk,PropagationPhase)
_CONV_ENUM(Gtk,ReliefStyle)
-_CONV_ENUM(Gtk,ResizeMode)
_CONV_ENUM(Gtk,RevealerTransitionType)
_CONV_ENUM(Gtk,ScrollType)
_CONV_ENUM(Gtk,SelectionMode)
@@ -133,7 +130,6 @@ _CONV_ENUM(Gtk,WidgetHelpType)
_CONV_ENUM(Gtk,WindowPosition)
_CONV_ENUM(Gtk,WindowType)
_CONV_ENUM(Gtk,WrapMode)
-_CONV_ENUM(Gtk,UIManagerItemType)
_CONV_ENUM(Gtk,FileChooserAction)
_CONV_ENUM(Gtk,FileFilterFlags)
_CONV_ENUM(Gtk,IconLookupFlags)
@@ -164,7 +160,6 @@ _CONV_ENUM(Gtk,WrapBoxPacking)
_CONV_ENUM(Gtk,WrapBoxSpreading)
_CONV_ENUM(Gtk,SizeRequestMode)
_CONV_ENUM(Gtk,ScrollablePolicy)
-_CONV_ENUM(Gtk,RegionFlags)
_CONV_ENUM(Gtk,JunctionSides)
_CONV_ENUM(Gtk,StateFlags)
_CONV_ENUM(Gtk,ApplicationInhibitFlags)
@@ -187,15 +182,6 @@ _CONVERSION(`SortType&',`GtkSortType*',`(($2) &($3))')
_CONVERSION(`SortType*',`GtkSortType*',`(($2) ($3))')
_CONVERSION(`GtkSortType*',`SortType*',`(($2) ($3))')
_CONVERSION(`guint8',`Gtk::StateType',`static_cast<StateType>($3)')
-_CONVERSION(`RegionFlags&',`GtkRegionFlags*',`(($2) &($3))')
-
-
-
-# StockID:
-_CONVERSION(`const StockID&',`const char*',`($3).get_c_str()')
-_CONVERSION(`const Gtk::StockID&',`const char*',`($3).get_c_str()')
-_CONVERSION(`char*',`StockID',`StockID($3)') # the StockID ctor handles 0
-_CONVERSION(`const char*',`StockID',`StockID($3)') # the StockID ctor handles 0
#
@@ -259,14 +245,10 @@ _CONVERSION(`Menu*',`GtkMenu*',__FP2P)
# Ptr (gtk+) -> Ptr (gtkmm) (downcast)
_CONVERSION(`GtkWidget*',`Button*',`Glib::wrap((GtkButton*)($3))')
_CONVERSION(`GtkWidget*',`Box*',`Glib::wrap((GtkBox*)($3))')
-_CONVERSION(`GtkWidget*',`HBox*',`Glib::wrap((GtkHBox*)($3))')
-_CONVERSION(`GtkWidget*',`VBox*',`Glib::wrap((GtkVBox*)($3))')
-_CONVERSION(`GtkWidget*',`ColorSelection*',`Glib::wrap((GtkColorSelection*)($3))')
_CONVERSION(`GtkWidget*',`Gtk::CheckButton*',__RP2PD)
_CONVERSION(`GtkWidget*',`Container*',`Glib::wrap((GtkContainer*)($3))')
_CONVERSION(`GtkWidget*',`const Container*',`Glib::wrap((GtkContainer*)($3))')
_CONVERSION(`GtkWidget*',`Entry*',`Glib::wrap((GtkEntry*)($3))')
-_CONVERSION(`GtkWidget*',`FontSelection*',`Glib::wrap((GtkFontSelection*)($3))')
_CONVERSION(`GtkWidget*',`HeaderBar*',`Glib::wrap((GtkHeaderBar*)($3))')
_CONVERSION(`GtkWidget*',`Label*',`Glib::wrap((GtkLabel*)($3))')
_CONVERSION(`GtkWidget*',`Menu*',`Glib::wrap((GtkMenu*)($3))')
@@ -274,15 +256,11 @@ _CONVERSION(`GtkWidget*',`MenuItem*',`Glib::wrap((GtkMenuItem*)($3))')
_CONVERSION(`GtkWidget*',`OptionMenu*',`Glib::wrap((GtkOptionMenu*)($3))')
_CONVERSION(`GtkWidget*',`RadioButton*',`Glib::wrap((GtkRadioButton*)($3))')
_CONVERSION(`GtkWidget*',`Gtk::Scrollbar*',__RP2PD)
-_CONVERSION(`GtkWidget*',`Gtk::HScrollbar*',__RP2PD)
-_CONVERSION(`GtkWidget*',`Gtk::VScrollbar*',__RP2PD)
-_CONVERSION(`GtkWidget*',`Table*',`Glib::wrap((GtkTable*)($3))')
_CONVERSION(`GtkWidget*',`Gtk::Tree*',__RP2PD)
_CONVERSION(`GtkWidget*',`ScrolledWindow*',`Glib::wrap((GtkScrolledWindow*)($3))')
_CONVERSION(`GtkWidget*',`Window*',`Glib::wrap((GtkWindow*)($3))')
_CONVERSION(`GtkWidget*',`TreeView*',`Glib::wrap((GtkTreeView*)($3))')
_CONVERSION(`GtkWidget*',`ButtonBox*',`Glib::wrap((GtkButtonBox*)($3))')
-_CONVERSION(`GtkWidget*',`HButtonBox*',`Glib::wrap((GtkHButtonBox*)($3))')
_CONVERSION(`GtkWidget*',`ComboDropDown*',`Glib::wrap((GtkList*)($3))')
_CONVERSION(`GtkWidget*',`Image*',`Glib::wrap((GtkImage*)($3))')
_CONVERSION(`GtkWidget*',`ToolItem*',`Glib::wrap((GtkToolItem*)($3))')
@@ -291,26 +269,18 @@ _CONVERSION(`GtkWidget*',`FileChooserDialog*',`Glib::wrap((GtkFileChooserDialog*
# Ptr (gtk+) -> const Ptr (gtkmm) (downcast)
_CONVERSION(`GtkWidget*',`const Button*',`Glib::wrap((GtkButton*)($3))')
_CONVERSION(`GtkWidget*',`const Box*',`Glib::wrap((GtkBox*)($3))')
-_CONVERSION(`GtkWidget*',`const HBox*',`Glib::wrap((GtkHBox*)($3))')
-_CONVERSION(`GtkWidget*',`const VBox*',`Glib::wrap((GtkVBox*)($3))')
-_CONVERSION(`GtkWidget*',`const ColorSelection*',`Glib::wrap((GtkColorSelection*)($3))')
_CONVERSION(`GtkWidget*',`const Gtk::CheckButton*',__RP2CPD)
_CONVERSION(`GtkWidget*',`const Entry*',`Glib::wrap((GtkEntry*)($3))')
-_CONVERSION(`GtkWidget*',`const FontSelection*',`Glib::wrap((GtkFontSelection*)($3))')
_CONVERSION(`GtkWidget*',`const Label*',`Glib::wrap((GtkLabel*)($3))')
_CONVERSION(`GtkWidget*',`const Menu*',`Glib::wrap((GtkMenu*)($3))')
_CONVERSION(`GtkWidget*',`const MenuItem*',`Glib::wrap((GtkMenuItem*)($3))')
_CONVERSION(`GtkWidget*',`const OptionMenu*',`Glib::wrap((GtkOptionMenu*)($3))')
_CONVERSION(`GtkWidget*',`const RadioButton*',`Glib::wrap((GtkRadioButton*)($3))')
_CONVERSION(`GtkWidget*',`const Gtk::Scrollbar*',__RP2CPD)
-_CONVERSION(`GtkWidget*',`const Gtk::HScrollbar*',__RP2CPD)
-_CONVERSION(`GtkWidget*',`const Gtk::VScrollbar*',__RP2CPD)
-_CONVERSION(`GtkWidget*',`const Table*',`Glib::wrap((GtkTable*)($3))')
_CONVERSION(`GtkWidget*',`const Gtk::Tree*',__RP2CPD)
_CONVERSION(`GtkWidget*',`const ScrolledWindow*',`Glib::wrap((GtkScrolledWindow*)($3))')
_CONVERSION(`GtkWidget*',`const Window*',`Glib::wrap((GtkWindow*)($3))')
_CONVERSION(`GtkWidget*',`const TreeView*',`Glib::wrap((GtkTreeView*)($3))')
-_CONVERSION(`GtkWidget*',`const HButtonBox*',`Glib::wrap((GtkHButtonBox*)($3))')
_CONVERSION(`GtkWidget*',`const ComboDropDown*',`Glib::wrap((GtkList*)($3))')
_CONVERSION(`GtkWidget*',`const FileChooserDialog*',`Glib::wrap((GtkFileChooserDialog*)($3))')
@@ -349,8 +319,6 @@ _CONVERSION(`const Glib::ListHandle<Widget*>&',`GList*',`$3.data()')
_CONVERSION(`const Glib::ListHandle<const Widget*>&',`GList*',`$3.data()')
_CONVERSION(`const Glib::ListHandle<Window*>&',`GList*',`$3.data()')
_CONVERSION(`const Glib::ListHandle<const Window*>&',`GList*',`$3.data()')
-_CONVERSION(`const Glib::SListHandle< Glib::RefPtr<RadioAction> >&',`GSList*',`$3.data()')
-_CONVERSION(`const Glib::SListHandle< Glib::RefPtr<const RadioAction> >&',`GSList*',`$3.data()')
# GList (gtk+) -> Glib::ListHandle<> (gtkmm)
define(`__FL2H_DEEP',`$`'2($`'3, Glib::OWNERSHIP_DEEP)')
@@ -368,10 +336,6 @@ _CONVERSION(`GList*',`Glib::ListHandle<CellRenderer*>',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle<const CellRenderer*>',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle<TreeModel::Row>',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle<const TreeModel::Row>',__FL2H_SHALLOW)
-_CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Action> >',__FL2H_SHALLOW)
-_CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const Action> >',__FL2H_SHALLOW)
-_CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<ActionGroup> >',__FL2H_SHALLOW)
-_CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const ActionGroup> >',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<RecentInfo> >',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle<RecentInfo>',__FL2H_SHALLOW)
_CONVERSION(`GList*',`Glib::ListHandle<const RecentInfo>', __FL2H_SHALLOW)
@@ -383,8 +347,6 @@ _CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<TextMark> >',__FL2H_SHALL
_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<const TextMark> >',__FL2H_SHALLOW)
_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<TextBuffer::Mark> >',__FL2H_SHALLOW)
_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<const TextBuffer::Mark> >',__FL2H_SHALLOW)
-_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<RadioAction> >',__FL2H_SHALLOW)
-_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<const RadioAction> >',__FL2H_SHALLOW)
_CONVERSION(`GSList*',`Glib::SListHandle<Glib::ustring>',__FL2H_DEEP)
_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<PixbufFormat> >',__FL2H_SHALLOW)
@@ -519,15 +481,6 @@ _CONVERSION(`const SelectionData&',`GtkSelectionData*', __FCR2P)
_CONVERSION(`SelectionData&',`GtkSelectionData*', __FR2P)
#_CONVERSION(`GtkSelectionData*',`SelectionData', `Gtk::SelectionData(($3), true)')
-_CONVERSION(`GtkAction*',`Glib::RefPtr<Action>',`Glib::wrap($3)')
-_CONVERSION(`GtkAction*',`Glib::RefPtr<const Action>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Action>&',`GtkAction*',__CONVERT_REFPTR_TO_P($3))
-_CONVERSION(`const Glib::RefPtr<RadioAction>&',`GtkRadioAction*',__CONVERT_REFPTR_TO_P($3))
-
-_CONVERSION(`GtkActionGroup*',`Glib::RefPtr<ActionGroup>',`Glib::wrap($3)')
-#_CONVERSION(`GtkActionGroup*',`Glib::RefPtr<const ActionGroup>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<ActionGroup>&',`GtkActionGroup*',__CONVERT_REFPTR_TO_P($3))
-
_CONVERSION(`GtkApplication*',`Glib::RefPtr<Application>',`Glib::wrap($3)')
_CONVERSION(`GtkApplication*',`Glib::RefPtr<const Application>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<Application>&',`GtkApplication*',__CONVERT_REFPTR_TO_P($3))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
