[gtkmm] Fix error messages from gmmproc
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix error messages from gmmproc
- Date: Fri, 20 Feb 2015 17:55:48 +0000 (UTC)
commit 56c701980088a92ae744c110394fd14bf9205586
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Fri Feb 20 18:53:12 2015 +0100
Fix error messages from gmmproc
* gtk/src/gtk_extra_objects.defs: Add WidgetPath.
* gtk/src/gtk_methods.defs: Regenerate with the latest version of h2def.py.
Then gtk_widget_get_requisition() is included.
* gdk/src/<many files>.hg:
* gtk/src/<many files>.hg: Avoid "gtkmmproc error" messages in the generated
files by not _IGNORE()ing non-existent functions. Unnecessary _IGNORE()s
generate error messages after the fix in bug 737212 was implemented.
gdk/src/display.hg | 3 +--
gdk/src/dragcontext.hg | 1 -
gdk/src/event.hg | 3 ---
gdk/src/pixbuf.hg | 3 ---
gdk/src/window.hg | 5 +----
gtk/src/aboutdialog.hg | 1 -
gtk/src/accelgroup.hg | 2 +-
gtk/src/accellabel.hg | 2 +-
gtk/src/action.hg | 5 -----
gtk/src/box.hg | 2 +-
gtk/src/buttonbox.hg | 2 --
gtk/src/calendar.hg | 4 ----
gtk/src/cellrenderer.hg | 2 --
gtk/src/cellview.hg | 5 -----
gtk/src/checkmenuitem.hg | 1 -
gtk/src/clipboard.hg | 3 +--
gtk/src/colorselection.hg | 3 +--
gtk/src/combobox.hg | 6 +-----
gtk/src/expander.hg | 2 +-
gtk/src/filechooserdialog.hg | 1 -
gtk/src/fixed.hg | 1 -
gtk/src/fontselection.hg | 3 ---
gtk/src/gtk_extra_objects.defs | 6 ++++++
gtk/src/gtk_methods.defs | 9 +++++++++
gtk/src/iconfactory.hg | 2 +-
gtk/src/iconinfo.hg | 2 +-
gtk/src/image.hg | 2 +-
gtk/src/label.hg | 1 -
gtk/src/layout.hg | 1 -
gtk/src/menu.hg | 2 --
gtk/src/menubutton.hg | 3 ---
gtk/src/menuitem.hg | 1 -
gtk/src/menutoolbutton.hg | 2 --
gtk/src/notebook.hg | 10 ----------
gtk/src/paned.hg | 1 -
gtk/src/plug.hg | 2 +-
gtk/src/progressbar.hg | 2 --
gtk/src/radiobutton.hg | 2 +-
gtk/src/recentchooser.hg | 3 ---
gtk/src/recentmanager.hg | 3 ---
gtk/src/socket.hg | 1 -
gtk/src/statusicon.hg | 2 --
gtk/src/textview.hg | 3 +--
gtk/src/toolbar.hg | 7 -------
gtk/src/toolpalette.hg | 3 ---
gtk/src/treemodel.hg | 2 +-
gtk/src/treeview.hg | 2 --
gtk/src/treeviewcolumn.hg | 2 --
gtk/src/widget.hg | 1 -
gtk/src/window.hg | 5 +----
50 files changed, 32 insertions(+), 110 deletions(-)
---
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 1007ca1..3f8f695 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -90,8 +90,7 @@ public:
_WRAP_METHOD(static Glib::RefPtr<Display> get_default(), gdk_display_get_default, refreturn)
- _IGNORE(gdk_display_get_pointer, gdk_display_get_core_pointer,
- gdk_display_get_window_at_pointer, gdk_display_warp_pointer) //deprecated
+ _IGNORE(gdk_display_get_pointer, gdk_display_get_window_at_pointer, gdk_display_warp_pointer) //deprecated
_WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(),
gdk_display_open_default_libgtk_only, refreturn)
diff --git a/gdk/src/dragcontext.hg b/gdk/src/dragcontext.hg
index d0846fa..2576c3c 100644
--- a/gdk/src/dragcontext.hg
+++ b/gdk/src/dragcontext.hg
@@ -43,7 +43,6 @@ _WRAP_ENUM(DragProtocol, GdkDragProtocol)
class DragContext : public Glib::Object
{
_CLASS_GOBJECT(DragContext, GdkDragContext, GDK_DRAG_CONTEXT, Glib::Object,GObject)
- _IGNORE(gdk_drag_context_ref, gdk_drag_context_unref)
protected:
public:
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 56d9380..c0f4931 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -58,7 +58,6 @@ public:
_WRAP_METHOD(static Event get(), gdk_event_get)
_WRAP_METHOD(static Event peek(), gdk_event_peek)
- _IGNORE(gdk_event_get_graphics_expose) //deprecated
_WRAP_METHOD(void put(), gdk_event_put)
_WRAP_METHOD(static bool events_pending(), gdk_events_pending)
@@ -79,5 +78,3 @@ public:
};
} // namespace Gdk
-
-
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 51dc710..798fb73 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -561,9 +561,6 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> rotate_simple(PixbufRotation angle) const, gdk_pixbuf_rotate_simple)
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> flip(bool horizontal = true) const, gdk_pixbuf_flip)
- //Use Gdk::Drawable::draw_pixbuf() instead of gdk_pixbuf_render_to_drawable(),
gdk_pixbuf_render_to_drawable_alpha().
- _IGNORE(gdk_pixbuf_render_to_drawable, gdk_pixbuf_render_to_drawable_alpha,)
-
_WRAP_METHOD(Glib::ustring get_option(const Glib::ustring& key) const, gdk_pixbuf_get_option)
_IGNORE(gdk_pixbuf_set_option) //gdk_pixbuf_set_option() is only available when GDK_PIXBUF_ENABLE_BACKEND
is defined.
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 3774b36..91aac53 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -62,7 +62,7 @@ class Window : public Glib::Object
{
_CLASS_GOBJECT(Window, GdkWindow, GDK_WINDOW, Glib::Object, GObject)
_STRUCT_NOT_HIDDEN
- _IGNORE(gdk_window_set_hints, gdk_window_destroy, gdk_window_new, gdk_window_get_deskrelative_origin)
+ _IGNORE(gdk_window_destroy, gdk_window_new)
_IGNORE(gdk_window_destroy_notify, gdk_window_is_destroyed)
protected:
@@ -194,7 +194,6 @@ public:
_WRAP_METHOD(void coords_to_parent(double x, double y, double& parent_x, double& parent_y),
gdk_window_coords_to_parent)
_WRAP_METHOD(void coords_from_parent(double parent_x, double parent_y, double& x, double& y),
gdk_window_coords_from_parent)
- _IGNORE(gdk_window_get_deskrelative_origin)
_WRAP_METHOD(void get_root_origin(int& x, int& y) const, gdk_window_get_root_origin)
_WRAP_METHOD(void get_frame_extents(Rectangle& rect), gdk_window_get_frame_extents, deprecated "Use the
const method instead.")
@@ -244,8 +243,6 @@ public:
_WRAP_METHOD(bool get_decorations(WMDecoration& decorations) const, gdk_window_get_decorations)
_WRAP_METHOD(void set_functions(WMFunction functions), gdk_window_set_functions)
- _IGNORE(gdk_window_get_toplevels) //deprecated
-
#m4 _CONVERSION(`cairo_surface_t*',`::Cairo::RefPtr< ::Cairo::Surface>',`::Cairo::RefPtr<
::Cairo::Surface>(new Cairo::Surface($3, false /* take reference */))')
#m4 _CONVERSION(`::Cairo::Content',`cairo_content_t',`(cairo_content_t)($3)')
_WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Surface> create_similar_surface(::Cairo::Content content, int
width, int height), gdk_window_create_similar_surface )
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index dc2d7fa..ccf961d 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -53,7 +53,6 @@ class AboutDialog : public Dialog
public:
_CTOR_DEFAULT()
- _IGNORE( gtk_about_dialog_get_name, gtk_about_dialog_set_name) //deprecated
_WRAP_METHOD(Glib::ustring get_program_name() const, gtk_about_dialog_get_program_name)
_WRAP_METHOD(void set_program_name(const Glib::ustring& name), gtk_about_dialog_set_program_name)
diff --git a/gtk/src/accelgroup.hg b/gtk/src/accelgroup.hg
index 66ce86c..5adda71 100644
--- a/gtk/src/accelgroup.hg
+++ b/gtk/src/accelgroup.hg
@@ -44,7 +44,7 @@ class AccelGroup : public Glib::Object
{
_CLASS_GOBJECT(AccelGroup, GtkAccelGroup, GTK_ACCEL_GROUP,Glib::Object,GObject)
_IGNORE(gtk_accel_group_connect, gtk_accel_group_connect_by_path, gtk_accel_group_disconnect,
- gtk_accel_group_query, _gtk_accel_group_reconnect)
+ gtk_accel_group_query)
_IGNORE_SIGNAL(accel_activate)
protected:
_CTOR_DEFAULT
diff --git a/gtk/src/accellabel.hg b/gtk/src/accellabel.hg
index eb97696..a5e8cd8 100644
--- a/gtk/src/accellabel.hg
+++ b/gtk/src/accellabel.hg
@@ -33,7 +33,7 @@ namespace Gtk
class AccelLabel : public Label
{
_CLASS_GTKOBJECT(AccelLabel,GtkAccelLabel,GTK_ACCEL_LABEL,Gtk::Label,GtkLabel)
- _IGNORE(gtk_accel_label_accelerator_width, gtk_accel_label_set_accel_closure)
+ _IGNORE(gtk_accel_label_set_accel_closure)
public:
//The default ctor doesn't correspond to any _new function, but gtkmenuitem.cc does a simple
g_object_new() with no properties.
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 9ede17e..1005245 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -177,8 +177,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item)
_WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu)
- _IGNORE(gtk_action_connect_proxy, gtk_action_disconnect_proxy) // deprecated
-
#m4 dnl // This isn't in convert_gtk.m4, and the default behaviour is wrong.
#m4 _CONVERSION(`GSList*', `std::vector<Widget*>', `Glib::SListHandler<Widget*>::slist_to_vector($3,
Glib::OWNERSHIP_NONE)')
#m4 _CONVERSION(`GSList*', `std::vector<const Widget*>', `Glib::SListHandler<const
Widget*>::slist_to_vector($3, Glib::OWNERSHIP_NONE)')
@@ -247,9 +245,6 @@ _DEPRECATE_IFDEF_END
_WRAP_PROPERTY("always-show-image", bool)
protected:
- _IGNORE(gtk_action_block_activate_from, gtk_action_unblock_activate_from) //deprecated
-
-protected:
//Widget-creation routines:
_WRAP_VFUNC(Widget* create_menu_item(), "create_menu_item")
_WRAP_VFUNC(Widget* create_tool_item(), "create_tool_item")
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index 7113885..1bf537c 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -80,7 +80,7 @@ class Box
{
_CLASS_GTKOBJECT(Box,GtkBox,GTK_BOX,Gtk::Container,GtkContainer)
_IMPLEMENTS_INTERFACE(Orientable)
- _IGNORE(gtk_box_pack_end_defaults, gtk_box_set_child_packing, gtk_box_pack_start_defaults,
gtk_box_query_child_packing)
+ _IGNORE(gtk_box_set_child_packing, gtk_box_query_child_packing)
public:
//Note that we try to use the same defaul parameter value as the default property value.
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index 22181ab..c73055f 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -55,8 +55,6 @@ class ButtonBox
{
_CLASS_GTKOBJECT(ButtonBox,GtkButtonBox,GTK_BUTTON_BOX,Gtk::Box,GtkBox)
_IMPLEMENTS_INTERFACE(Orientable)
- _IGNORE(gtk_button_box_set_spacing, gtk_button_box_get_spacing, gtk_button_box_set_child_size,
- gtk_button_box_set_child_ipadding, gtk_button_box_get_child_size,
gtk_button_box_get_child_ipadding)
public:
//Note that we try to use the same defaul parameter value as the default property value.
_WRAP_CTOR(ButtonBox(Orientation orientation = ORIENTATION_HORIZONTAL), gtk_button_box_new)
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 6dd49e7..9af5767 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -62,8 +62,6 @@ public:
_WRAP_METHOD(void unmark_day(guint day), gtk_calendar_unmark_day)
_WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
- _IGNORE(gtk_calendar_display_options) //deprecated
-
_WRAP_METHOD(void set_display_options(CalendarDisplayOptions flags), gtk_calendar_set_display_options)
_WRAP_METHOD(CalendarDisplayOptions get_display_options() const, gtk_calendar_get_display_options)
@@ -119,8 +117,6 @@ public:
_WRAP_METHOD(bool get_day_is_marked(guint day) const, gtk_calendar_get_day_is_marked)
- _IGNORE(gtk_calendar_freeze, gtk_calendar_thaw) //deprecated
-
_WRAP_SIGNAL(void month_changed(), "month_changed")
_WRAP_SIGNAL(void day_selected(), "day_selected")
_WRAP_SIGNAL(void day_selected_double_click(), "day_selected_double_click")
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 80c0ff2..6507f3e 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -80,8 +80,6 @@ public:
_WRAP_METHOD(void set_fixed_size(int width, int height), gtk_cell_renderer_set_fixed_size)
_WRAP_METHOD(void get_fixed_size(int& width, int& height) const, gtk_cell_renderer_get_fixed_size)
- _IGNORE(gtk_cell_renderer_editing_canceled) //deprecated
-
_WRAP_METHOD(void set_alignment(float xalign, float yalign), gtk_cell_renderer_set_alignment)
_WRAP_METHOD(void get_alignment(float& xalign, float& yalign) const, gtk_cell_renderer_get_alignment)
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index a82b406..3f5d5d7 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -74,9 +74,6 @@ public:
explicit CellView(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
_IGNORE(gtk_cell_view_new_with_pixbuf)
- //_WRAP_METHOD(void set_value(CellRenderer& renderer, const Glib::ustring& property, const
Glib::ValueBase& value), gtk_cell_view_set_value)
- _IGNORE(gtk_cell_view_set_values)
-
_WRAP_METHOD(void set_model(const Glib::RefPtr<TreeModel>& model), gtk_cell_view_set_model)
/** Remove the model from the CellView.
@@ -102,8 +99,6 @@ public:
_WRAP_METHOD(bool get_fit_model() const, gtk_cell_view_get_fit_model)
_WRAP_METHOD(void set_fit_model(bool fit_model = true), gtk_cell_view_set_fit_model)
- _IGNORE(gtk_cell_view_get_cell_renderers) //deprecated
-
_WRAP_PROPERTY("background", Glib::ustring)
_WRAP_PROPERTY("background-gdk", Gdk::Color, deprecated "Use property_background_rgba() instead.")
_WRAP_PROPERTY("background-rgba", Gdk::RGBA)
diff --git a/gtk/src/checkmenuitem.hg b/gtk/src/checkmenuitem.hg
index 4f69261..71d2be2 100644
--- a/gtk/src/checkmenuitem.hg
+++ b/gtk/src/checkmenuitem.hg
@@ -33,7 +33,6 @@ namespace Gtk
class CheckMenuItem : public MenuItem
{
_CLASS_GTKOBJECT(CheckMenuItem,GtkCheckMenuItem,GTK_CHECK_MENU_ITEM,Gtk::MenuItem,GtkMenuItem)
- _IGNORE(gtk_check_menu_item_set_show_toggle)
public:
_CTOR_DEFAULT
diff --git a/gtk/src/clipboard.hg b/gtk/src/clipboard.hg
index 9b083d4..d730ff1 100644
--- a/gtk/src/clipboard.hg
+++ b/gtk/src/clipboard.hg
@@ -289,7 +289,7 @@ public:
* dependent, see Gdk::Display::store_clipboard() for more information.
*/
void set_can_store();
- _IGNORE(void gtk_clipboard_set_can_store)
+ _IGNORE(gtk_clipboard_set_can_store)
_WRAP_METHOD(void store(), gtk_clipboard_store)
@@ -298,4 +298,3 @@ public:
};
} //namespace Gtk
-
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index ae6ef61..5e35068 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -49,8 +49,7 @@ class ColorSelection : public VBox
{
_CLASS_GTKOBJECT(ColorSelection,GtkColorSelection,GTK_COLOR_SELECTION,Gtk::VBox,GtkVBox)
_IS_DEPRECATED
- _IGNORE(gtk_color_selection_get_current_color, gtk_color_selection_get_previous_color,
- gtk_color_selection_set_color, gtk_color_selection_get_color,
gtk_color_selection_set_update_policy)
+ _IGNORE(gtk_color_selection_get_current_color, gtk_color_selection_get_previous_color)
public:
_CTOR_DEFAULT()
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 15387e4..97bb175 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -93,9 +93,7 @@ public:
*/
explicit ComboBox(const Glib::RefPtr<CellArea>& cell_area, bool has_entry = false);
_IGNORE(gtk_combo_box_new_with_area, gtk_combo_box_new_with_area_and_entry)
-
- _IGNORE(gtk_combo_box_new, gtk_combo_box_new_text) //See ComboBoxText for an equivalent of
gtk_combo_box_new_text().
-
+ _IGNORE(gtk_combo_box_new)
_WRAP_METHOD(void set_wrap_width(int width), gtk_combo_box_set_wrap_width)
_WRAP_METHOD(int get_wrap_width() const, gtk_combo_box_get_wrap_width)
@@ -208,8 +206,6 @@ public:
*/
_WRAP_METHOD(bool set_active_id(const Glib::ustring& active_id), gtk_combo_box_set_active_id)
- _IGNORE(gtk_combo_box_append_text, gtk_combo_box_insert_text, gtk_combo_box_prepend_text,
gtk_combo_box_remove_text, gtk_combo_box_get_active_text) //deprecated
-
/** @see Bin::get_child().
* @newin{2,24}
*/
diff --git a/gtk/src/expander.hg b/gtk/src/expander.hg
index 80d9bb9..a4cf1ed 100644
--- a/gtk/src/expander.hg
+++ b/gtk/src/expander.hg
@@ -77,7 +77,7 @@ public:
* @newin{2,4}
*/
explicit Expander(const Glib::ustring& label, bool mnemonic = false);
- _IGNORE(gtk_expander_new, gkt_expander_new_with_mnemonic)
+ _IGNORE(gtk_expander_new, gtk_expander_new_with_mnemonic)
_WRAP_METHOD(void set_expanded(bool expanded = true), gtk_expander_set_expanded)
_WRAP_METHOD(bool get_expanded() const, gtk_expander_get_expanded)
diff --git a/gtk/src/filechooserdialog.hg b/gtk/src/filechooserdialog.hg
index b37d520..17e79df 100644
--- a/gtk/src/filechooserdialog.hg
+++ b/gtk/src/filechooserdialog.hg
@@ -44,7 +44,6 @@ public:
explicit FileChooserDialog(Gtk::Window& parent, const Glib::ustring& title, FileChooserAction action =
FILE_CHOOSER_ACTION_OPEN);
explicit FileChooserDialog(const Glib::ustring& title, FileChooserAction action =
FILE_CHOOSER_ACTION_OPEN);
- _IGNORE(gtk_file_chooser_dialog_new_with_backend)
explicit FileChooserDialog(Gtk::Window& parent, const Glib::ustring& title, FileChooserAction action,
const Glib::ustring& backend);
explicit FileChooserDialog(const Glib::ustring& title, FileChooserAction action, const Glib::ustring&
backend);
};
diff --git a/gtk/src/fixed.hg b/gtk/src/fixed.hg
index e1133b2..5a78957 100644
--- a/gtk/src/fixed.hg
+++ b/gtk/src/fixed.hg
@@ -45,7 +45,6 @@ public:
_WRAP_METHOD(void put(Widget& widget, int x, int y), gtk_fixed_put)
_WRAP_METHOD(void move(Widget& widget, int x, int y), gtk_fixed_move)
- _IGNORE(gtk_fixed_set_has_window, gtk_fixed_get_has_window) // deprecated
_WRAP_CHILD_PROPERTY("x", int)
_WRAP_CHILD_PROPERTY("y", int)
diff --git a/gtk/src/fontselection.hg b/gtk/src/fontselection.hg
index 264d5cb..a56e2d4 100644
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@ -51,7 +51,6 @@ class FontSelection : public VBox
{
_CLASS_GTKOBJECT(FontSelection,GtkFontSelection,GTK_FONT_SELECTION,Gtk::VBox,GtkVBox)
_IS_DEPRECATED
- _IGNORE(gtk_font_selection_get_font) //deprecated
public:
_CTOR_DEFAULT()
@@ -122,8 +121,6 @@ public:
_WRAP_METHOD(Button* get_cancel_button(), gtk_font_selection_dialog_get_cancel_button)
_WRAP_METHOD(const Button* get_cancel_button() const, gtk_font_selection_dialog_get_cancel_button,
constversion)
-
- _IGNORE(gtk_font_selection_dialog_get_apply_button) //deprecated
};
} // namespace Gtk
diff --git a/gtk/src/gtk_extra_objects.defs b/gtk/src/gtk_extra_objects.defs
index f7a79a3..98d02e7 100644
--- a/gtk/src/gtk_extra_objects.defs
+++ b/gtk/src/gtk_extra_objects.defs
@@ -150,3 +150,9 @@
(c-name "GtkTreeRowReference")
(gtype-id "GTK_TYPE_TREE_ROW_REFERENCE")
)
+
+(define-object WidgetPath
+ (in-module "Gtk")
+ (c-name "GtkWidgetPath")
+ (gtype-id "GTK_TYPE_WIDGET_PATH")
+)
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index e608949..c0d00db 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -35171,6 +35171,15 @@
)
)
+(define-method get_requisition
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_requisition")
+ (return-type "none")
+ (parameters
+ '("GtkRequisition*" "requisition")
+ )
+)
+
(define-method child_focus
(of-object "GtkWidget")
(c-name "gtk_widget_child_focus")
diff --git a/gtk/src/iconfactory.hg b/gtk/src/iconfactory.hg
index 587a204..edf42a1 100644
--- a/gtk/src/iconfactory.hg
+++ b/gtk/src/iconfactory.hg
@@ -40,7 +40,7 @@ namespace Gtk
class IconFactory : public Glib::Object
{
_CLASS_GOBJECT(IconFactory, GtkIconFactory, GTK_ICON_FACTORY, Glib::Object, GObject)
- _IGNORE(gtk_icon_factory_lookup, gtk_icon_factory_lookup_for_settings)
+ _IGNORE(gtk_icon_factory_lookup)
protected:
_CTOR_DEFAULT()
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index afa22d4..e24e26e 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -42,7 +42,7 @@ class IconTheme;
class IconInfo
{
_CLASS_BOXEDTYPE(IconInfo, GtkIconInfo, NONE, gtk_icon_info_ref, g_object_unref)
- _IGNORE(gtk_icon_info_get_attach_points, g_object_ref, g_object_unref, gtk_icon_info_copy,
gtk_icon_info_free)
+ _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);
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index b313401..6062abe 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -58,7 +58,7 @@ _WRAP_ENUM(ImageType, GtkImageType)
class Image : public Misc
{
_CLASS_GTKOBJECT(Image,GtkImage,GTK_IMAGE,Gtk::Misc,GtkMisc)
- _IGNORE(gtk_image_set, gtk_image_get, gtk_image_get_pixmap, gtk_image_get_image, gtk_image_get_stock,
gtk_image_get_icon_set)
+ _IGNORE(gtk_image_get_stock, gtk_image_get_icon_set)
public:
_CTOR_DEFAULT
diff --git a/gtk/src/label.hg b/gtk/src/label.hg
index 2810977..4fcfeec 100644
--- a/gtk/src/label.hg
+++ b/gtk/src/label.hg
@@ -40,7 +40,6 @@ class Menu;
class Label : public Misc
{
_CLASS_GTKOBJECT(Label, GtkLabel, GTK_LABEL, Gtk::Misc,GtkMisc)
- _IGNORE(gtk_label_get, gtk_label_parse_uline)
public:
Label();
explicit Label(const Glib::ustring& label, bool mnemonic = false);
diff --git a/gtk/src/layout.hg b/gtk/src/layout.hg
index a98e470..d154206 100644
--- a/gtk/src/layout.hg
+++ b/gtk/src/layout.hg
@@ -45,7 +45,6 @@ class Layout
{
_CLASS_GTKOBJECT(Layout,GtkLayout,GTK_LAYOUT,Gtk::Container,GtkContainer)
_IMPLEMENTS_INTERFACE(Scrollable)
- _IGNORE(gtk_layout_freeze, gtk_layout_thaw)
public:
_CTOR_DEFAULT
_WRAP_CTOR(Layout(const Glib::RefPtr<Adjustment>& hadjustment, const Glib::RefPtr<Adjustment>&
vadjustment), gtk_layout_new)
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index f054c6a..4ff031c 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -45,8 +45,6 @@ class AccelGroup;
class Menu : public MenuShell
{
_CLASS_GTKOBJECT(Menu,GtkMenu,GTK_MENU,Gtk::MenuShell,GtkMenuShell)
-
- _IGNORE(gtk_menu_append, gtk_menu_prepend, gtk_menu_insert) //deprecated.
public:
_CTOR_DEFAULT
diff --git a/gtk/src/menubutton.hg b/gtk/src/menubutton.hg
index 03caa05..d26dca2 100644
--- a/gtk/src/menubutton.hg
+++ b/gtk/src/menubutton.hg
@@ -45,7 +45,6 @@ public:
_WRAP_METHOD(void set_menu(Menu& menu), gtk_menu_button_set_popup, deprecated "Use set_popup() instead.")
- _IGNORE(gtk_menu_button_set_menu)
_DEPRECATE_IFDEF_START
/** Disables the button.
@@ -57,7 +56,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(Menu* get_menu(), gtk_menu_button_get_popup, deprecated "Use get_popup() instead.")
_WRAP_METHOD(const Menu* get_menu() const, gtk_menu_button_get_popup, constversion, deprecated "Use
get_popup() instead.")
- _IGNORE(gtk_menu_button_get_menu)
_WRAP_METHOD(void set_popup(Menu& menu), gtk_menu_button_set_popup)
@@ -67,7 +65,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(Menu* get_popup(), gtk_menu_button_get_popup)
_WRAP_METHOD(const Menu* get_popup() const, gtk_menu_button_get_popup, constversion)
- _IGNORE(gtk_menu_button_set_menu)
_WRAP_METHOD(void set_popover(Popover& popover), gtk_menu_button_set_popover)
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index f605fda..ccf04d3 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -70,7 +70,6 @@ public:
_WRAP_METHOD(Menu* get_submenu(), gtk_menu_item_get_submenu)
_WRAP_METHOD(const Menu* get_submenu() const, gtk_menu_item_get_submenu, constversion)
bool has_submenu() const;
- _IGNORE(gtk_menu_item_remove_submenu) //deprecated
_WRAP_METHOD(void select(), gtk_menu_item_select)
_WRAP_METHOD(void deselect(), gtk_menu_item_deselect)
_WRAP_METHOD(void activate(), gtk_menu_item_activate)
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index cfe3f02..f00e791 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -76,8 +76,6 @@ public:
_WRAP_METHOD(Menu* get_menu(), gtk_menu_tool_button_get_menu)
_WRAP_METHOD(const Menu* get_menu() const, gtk_menu_tool_button_get_menu, constversion)
- _IGNORE(gtk_menu_tool_button_set_arrow_tooltip) //deprecated
-
_WRAP_METHOD(void set_arrow_tooltip_text(const Glib::ustring& text),
gtk_menu_tool_button_set_arrow_tooltip_text)
_WRAP_METHOD(void set_arrow_tooltip_markup(const Glib::ustring& markup),
gtk_menu_tool_button_set_arrow_tooltip_markup)
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 99a045a..b535f31 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -50,7 +50,6 @@ _WRAP_ENUM(NotebookTab, GtkNotebookTab)
class Notebook : public Container
{
_CLASS_GTKOBJECT(Notebook,GtkNotebook,GTK_NOTEBOOK,Gtk::Container,GtkContainer)
- _IGNORE(gtk_notebook_set_homogeneous_tabs, gtk_notebook_set_tab_border, gtk_notebook_set_tab_hborder,
gtk_notebook_set_tab_vborder)
public:
@@ -86,8 +85,6 @@ public:
_WRAP_METHOD(void remove_page(int page_num = 0), gtk_notebook_remove_page)
void remove_page(Widget& child);
- _IGNORE(gtk_notebook_set_group_id, gtk_notebook_get_group_id) //deprecated
-
_WRAP_METHOD(void set_group_name(const Glib::ustring& group_name), gtk_notebook_set_group_name)
_WRAP_METHOD(Glib::ustring get_group_name() const, gtk_notebook_get_group_name)
@@ -133,8 +130,6 @@ public:
_WRAP_METHOD(void set_menu_label_text(Widget& child, const Glib::ustring& menu_text),
gtk_notebook_set_menu_label_text)
_WRAP_METHOD(Glib::ustring get_menu_label_text(Widget& child) const, gtk_notebook_get_menu_label_text)
- _IGNORE(gtk_notebook_query_tab_label_packing, gtk_notebook_set_tab_label_packing) //deprecated
-
_WRAP_METHOD(void reorder_child(Widget& child, int position), gtk_notebook_reorder_child)
_WRAP_METHOD(bool get_tab_reorderable(Widget& child) const, gtk_notebook_get_tab_reorderable)
@@ -177,9 +172,4 @@ public:
_WRAP_CHILD_PROPERTY("detachable", bool)
};
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
} // namespace Gtk
diff --git a/gtk/src/paned.hg b/gtk/src/paned.hg
index 71b0934..b5ab091 100644
--- a/gtk/src/paned.hg
+++ b/gtk/src/paned.hg
@@ -64,7 +64,6 @@ class Paned
{
_CLASS_GTKOBJECT(Paned,GtkPaned,GTK_PANED,Gtk::Container,GtkContainer)
_IMPLEMENTS_INTERFACE(Orientable)
- _IGNORE(gtk_paned_compute_position)
public:
diff --git a/gtk/src/plug.hg b/gtk/src/plug.hg
index fc5017a..0c1b248 100644
--- a/gtk/src/plug.hg
+++ b/gtk/src/plug.hg
@@ -56,7 +56,7 @@ class Plug : public Window
{
_CLASS_GTKOBJECT(Plug, GtkPlug, GTK_PLUG, Gtk::Window, GtkWindow)
_UNMANAGEABLE
- _IGNORE(gtk_plug_construct, gtk_plug_construct_for_display, _gtk_plug_add_to_socket,
_gtk_plug_remove_from_socket)
+ _IGNORE(gtk_plug_construct, gtk_plug_construct_for_display)
public:
Plug();
diff --git a/gtk/src/progressbar.hg b/gtk/src/progressbar.hg
index 95b2dfa..5d5417c 100644
--- a/gtk/src/progressbar.hg
+++ b/gtk/src/progressbar.hg
@@ -65,8 +65,6 @@ class ProgressBar
{
_CLASS_GTKOBJECT(ProgressBar,GtkProgressBar,GTK_PROGRESS_BAR,Gtk::Widget,GtkWidget,GtkProgressBar)
_IMPLEMENTS_INTERFACE(Orientable)
- _IGNORE(gtk_progress_bar_new_with_adjustment, gtk_progress_bar_set_bar_style,
gtk_progress_bar_set_discrete_blocks,
- gtk_progress_bar_set_activity_step, gtk_progress_bar_set_activity_blocks, gtk_progress_bar_update)
public:
_CTOR_DEFAULT()
diff --git a/gtk/src/radiobutton.hg b/gtk/src/radiobutton.hg
index aef52e3..c8c0491 100644
--- a/gtk/src/radiobutton.hg
+++ b/gtk/src/radiobutton.hg
@@ -38,7 +38,7 @@ namespace Gtk
class RadioButton : public CheckButton
{
_CLASS_GTKOBJECT(RadioButton,GtkRadioButton,GTK_RADIO_BUTTON,Gtk::CheckButton,GtkCheckButton)
- _IGNORE(gtk_radio_button_group, gtk_radio_button_new_from_widget,
gtk_radio_button_new_with_mnemonic_from_widget, gtk_radio_button_new_with_label_from_widget)
+ _IGNORE(gtk_radio_button_new_from_widget, gtk_radio_button_new_with_mnemonic_from_widget,
gtk_radio_button_new_with_label_from_widget)
public:
typedef RadioButtonGroup Group;
diff --git a/gtk/src/recentchooser.hg b/gtk/src/recentchooser.hg
index cddd5e8..c6fdb4e 100644
--- a/gtk/src/recentchooser.hg
+++ b/gtk/src/recentchooser.hg
@@ -69,9 +69,6 @@ public:
_WRAP_METHOD(void set_show_tips(bool show_tips = true), gtk_recent_chooser_set_show_tips)
_WRAP_METHOD(bool get_show_tips() const, gtk_recent_chooser_get_show_tips)
- // Deprecated in GTK+ 2.12. murrayc:
- _IGNORE(gtk_recent_chooser_get_show_numbers, gtk_recent_chooser_set_show_numbers)
-
_WRAP_METHOD(void set_show_icons(bool show_icons = true), gtk_recent_chooser_set_show_icons)
_WRAP_METHOD(bool get_show_icons() const, gtk_recent_chooser_get_show_icons)
_WRAP_METHOD(void set_sort_type(RecentSortType sort_type), gtk_recent_chooser_set_sort_type)
diff --git a/gtk/src/recentmanager.hg b/gtk/src/recentmanager.hg
index 7a8bf67..62749fd 100644
--- a/gtk/src/recentmanager.hg
+++ b/gtk/src/recentmanager.hg
@@ -72,7 +72,6 @@ public:
_WRAP_CREATE()
_WRAP_METHOD(static Glib::RefPtr<RecentManager> get_default(), gtk_recent_manager_get_default, refreturn)
- _IGNORE(gtk_recent_manager_get_for_screen) //deprecated
/** Meta-data passed to add_item(). You should
* use RecentManager::Data if you want to control the meta-data associated
@@ -103,8 +102,6 @@ public:
bool is_private;
};
- _IGNORE(gtk_recent_manager_set_screen) //deprecated
-
/** Adds a new resource into the recently used resources list. This function
* will try and guess some of the meta-data associated to a URI. If you
* know some of meta-data about the document yourself, set the desired
diff --git a/gtk/src/socket.hg b/gtk/src/socket.hg
index ddbf2ba..4d2c1e8 100644
--- a/gtk/src/socket.hg
+++ b/gtk/src/socket.hg
@@ -81,7 +81,6 @@ namespace Gtk
class Socket : public Container
{
_CLASS_GTKOBJECT(Socket, GtkSocket, GTK_SOCKET, Gtk::Container, GtkContainer)
- _IGNORE(gtk_socket_steal)
public:
_CTOR_DEFAULT
diff --git a/gtk/src/statusicon.hg b/gtk/src/statusicon.hg
index cf4fa51..c1990f5 100644
--- a/gtk/src/statusicon.hg
+++ b/gtk/src/statusicon.hg
@@ -130,8 +130,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_status_icon_get_screen, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_status_icon_get_screen, refreturn,
constversion)
- _IGNORE(gtk_status_icon_set_tooltip) //deprecated
-
_WRAP_METHOD(void set_visible(bool visible = true), gtk_status_icon_set_visible)
_WRAP_METHOD(bool get_visible() const, gtk_status_icon_get_visible)
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 7391194..ee10c45 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -214,18 +214,17 @@ public:
//Keybinding signals:
_IGNORE_SIGNAL("move_cursor")
- _IGNORE_SIGNAL("page_horizontally")
_IGNORE_SIGNAL("delete_from_cursor")
_IGNORE_SIGNAL("cut_clipboard")
_IGNORE_SIGNAL("copy_clipboard")
_IGNORE_SIGNAL("paste_clipboard")
_IGNORE_SIGNAL("toggle_overwrite")
- _IGNORE_SIGNAL("move_focus")
_IGNORE_SIGNAL("move_viewport")
_IGNORE_SIGNAL("select_all")
_IGNORE_SIGNAL("backspace")
_IGNORE_SIGNAL("toggle_cursor_visible")
_IGNORE_SIGNAL("preedit-changed")
+ _IGNORE_SIGNAL("extend-selection")
_WRAP_PROPERTY("pixels-above-lines", int)
_WRAP_PROPERTY("pixels-below-lines", int)
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 8f6f312..78addd9 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -88,15 +88,8 @@ public:
_WRAP_SIGNAL(void toolbar_style_changed(ToolbarStyle style), "style_changed")
_WRAP_SIGNAL(bool popup_context_menu(int x, int y, int button_number), "popup_context_menu")
- _IGNORE_SIGNAL("move_focus")
_IGNORE_SIGNAL("focus_home_or_end")
- //Ignore deprecated GtkToolbarAPI:
- _IGNORE(gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item,
gtk_toolbar_insert_stock
- gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space,
gtk_toolbar_remove_space
- gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element,
- gtk_toolbar_append_widget, gtk_toolbar_prepend_widget, gtk_toolbar_insert_widget)
-
_WRAP_PROPERTY("toolbar_style", ToolbarStyle)
_WRAP_PROPERTY("show_arrow", bool)
_WRAP_PROPERTY("icon-size", IconSize)
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
index 0ddf306..879e575 100644
--- a/gtk/src/toolpalette.hg
+++ b/gtk/src/toolpalette.hg
@@ -97,9 +97,6 @@ public:
_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)
- //Ignore the set_scroll_adjustment signal. It's deprecated.
- _IGNORE_SIGNAL(set_scroll_adjustments)
-
_WRAP_PROPERTY("icon-size", IconSize)
_WRAP_PROPERTY("icon-size-set", bool)
_WRAP_PROPERTY("toolbar-style", ToolbarStyle)
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index c9d3d31..45ea30d 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -108,7 +108,7 @@ public:
//These are part of GtkTreeModelFilter or GtkTreeModelSort, not GtkTreeModel:
- _IGNORE(gtk_tree_model_filter_new, gtk_tree_model_sort_new_with_model,
gtk_tree_model_filter_sort_new_with_model)
+ _IGNORE(gtk_tree_model_filter_new, gtk_tree_model_sort_new_with_model)
/** Returns a valid iterator pointing to @a path.
*
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 78e00b3..c9a406d 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -557,8 +557,6 @@ public:
_WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_tree_view_get_visible_rect)
- _IGNORE(gtk_tree_view_widget_to_tree_coords, gtk_tree_view_tree_to_widget_coords) //deprecated
-
bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
_IGNORE(gtk_tree_view_get_visible_range)
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index 8e932a6..69025ef 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -97,8 +97,6 @@ public:
_WRAP_METHOD(void clear(), gtk_tree_view_column_clear)
- _IGNORE(gtk_tree_view_column_get_cell_renderers, gtk_tree_view_column_get_cell_renderers) //deprecated
-
_WRAP_METHOD(void add_attribute(CellRenderer& cell_renderer, const Glib::ustring& attribute, int column),
gtk_tree_view_column_add_attribute)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index bb10594..94ee364 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -567,7 +567,6 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets,
Gdk::DragAction actions, int button, GdkEvent* event), gtk_drag_begin, refreturn)
_WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets,
Gdk::DragAction actions, int button, GdkEvent* 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)
- _IGNORE(_gtk_drag_source_handle_event, _gtk_drag_dest_handle_event)
//These should be a method of Gdk::DragContext, but gdkmm can't depend on gtkmm.
static Widget* drag_get_source_widget(const Glib::RefPtr<Gdk::DragContext>& context);
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 8c25be0..2539e39 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -51,9 +51,7 @@ class Window : public Bin
{
_CLASS_GTKOBJECT(Window,GtkWindow,GTK_WINDOW,Gtk::Bin,GtkBin)
_UNMANAGEABLE
- _IGNORE(_gtk_window_internal_set_focus, _gtk_window_reposition, _gtk_window_constrain_size,
gtk_window_remove_embedded_xid,
- _gtk_window_get_group, _gtk_window_activate_key, gtk_window_add_embedded_xid,
_gtk_window_keys_foreach,
- gtk_window_set_has_user_ref_count, gtk_window_set_destroy_with_parent,
gtk_window_get_icon_for_size,
+ _IGNORE(gtk_window_set_has_user_ref_count, gtk_window_set_destroy_with_parent,
gtk_window_get_icon_for_size,
gtk_window_set_use_subsurface, gtk_window_set_hardcoded_window)
//TODO: Use gtk_window_set_destroy_with_parent() to allow use of Gtk::manage() with top-level windows,
using the transient-parent?
@@ -128,7 +126,6 @@ public:
//Keybinding signals:
_IGNORE_SIGNAL("activate_focus")
_IGNORE_SIGNAL("activate_default")
- _IGNORE_SIGNAL("move_focus")
#m4begin
dnl// Hook in special code to catch explicit uses of gtk_object_destroy() by
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]