[gtkmm] Restore many other changes from the gtkmm-3maybe branch.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Restore many other changes from the gtkmm-3maybe branch.
- Date: Mon, 17 May 2010 22:24:44 +0000 (UTC)
commit ab53bf76e4065d5e687e00c27f9d7d80095c830b
Author: Murray Cumming <murrayc murrayc com>
Date: Tue May 18 00:24:07 2010 +0200
Restore many other changes from the gtkmm-3maybe branch.
These were apparently lost during the git rebase. The ChangeLog
entries seem to be correct, however.
ChangeLog | 7 +++
README | 2 +-
gdk/gdkmm/general.h | 34 ++++++++++++++--
gdk/src/colormap.ccg | 2 -
gdk/src/window.hg | 1 -
gtk/src/action.hg | 3 +-
gtk/src/box.hg | 4 +-
gtk/src/button.hg | 1 -
gtk/src/buttonbox.ccg | 52 -------------------------
gtk/src/buttonbox.hg | 29 --------------
gtk/src/cellrenderer.hg | 4 +-
gtk/src/colorselection.ccg | 5 --
gtk/src/colorselection.hg | 30 --------------
gtk/src/filelist.am | 2 +-
gtk/src/fontselection.hg | 36 +-----------------
gtk/src/handlebox.ccg | 17 --------
gtk/src/handlebox.hg | 28 -------------
gtk/src/menuitem.hg | 1 -
gtk/src/menushell.hg | 4 +-
gtk/src/notebook.hg | 14 ++++---
gtk/src/offscreenwindow.hg | 3 -
gtk/src/pagesetup.hg | 2 +-
gtk/src/range.ccg | 8 ++++
gtk/src/range.hg | 1 +
gtk/src/ruler.hg | 18 ---------
gtk/src/scalebutton.hg | 1 +
gtk/src/scrolledwindow.hg | 16 --------
gtk/src/table.hg | 4 +-
gtk/src/tearoffmenuitem.ccg | 5 --
gtk/src/tearoffmenuitem.hg | 11 -----
gtk/src/toolitem.hg | 2 +
gtk/src/treeview.hg | 4 +-
gtk/src/widget.ccg | 83 +---------------------------------------
gtk/src/widget.hg | 90 +++---------------------------------------
gtk/src/window.ccg | 14 -------
gtk/src/window.hg | 23 -----------
36 files changed, 79 insertions(+), 482 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b827b2c..e46ade7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-18 Murray Cumming <murrayc murrayc com>
+
+ Restore many other changes from the gtkmm-3maybe branch.
+
+ These were apparently lost during the git rebase. The ChangeLog
+ entries seem to be correct, however.
+
2010-05-17 Murray Cumming <murrayc murrayc com>
* gtk/src/filelist.am: Remove the mention of curve.hg and inputdialog.hg
diff --git a/README b/README
index b480135..ea1d8e0 100644
--- a/README
+++ b/README
@@ -1,3 +1,3 @@
-This is gtkmm, a C++ API for GTK+.
+This is gtkmm, the C++ API for GTK+.
See http://www.gtkmm.org/
diff --git a/gdk/gdkmm/general.h b/gdk/gdkmm/general.h
index f8dfbf6..3c75397 100644
--- a/gdk/gdkmm/general.h
+++ b/gdk/gdkmm/general.h
@@ -37,51 +37,75 @@ void flush();
namespace Cairo
{
+#ifndef GDKMM_DISABLE_DEPRECATED
/** Sets the specified Gdk::Color as the source color of the Cairo context.
* @param @context The cairo context.
* @param color The color to use as the source color.
*
- * @newin{2,12}
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color);
+#endif
+#ifndef GDKMM_DISABLE_DEPRECATED
/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y.
* @param @context The cairo context.
* @param pixbuf A Gdk::Pixbuf
* @param pixbuf_x X coordinate of location to place upper left corner of pixbuf.
* @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf.
*
- * @newin{2,12}
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
void set_source_pixbuf(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y);
+#endif
+#ifndef GDKMM_DISABLE_DEPRECATED
/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y.
* @param @context The cairo context.
* @param pixmap A Gdk::Pixmap
* @param pixmap_x X coordinate of location to place upper left corner of pixmap.
* @param pixmap_y Y coordinate of location to place upper left corner of pixmap.
*
- * @newin{2,12}
+ * @deprecated Use the overloaded function that takes a const RefPtr
+ * reference.
+ *
+ * @newin{2,10}
*/
void set_source_pixmap(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y);
+#endif
+#ifndef GDKMM_DISABLE_DEPRECATED
/** Adds the given rectangle to the current path of the context.
*
* @param context A cairo context.
* @param rectangle A rectangle to add to the path of the context.
*
- * @newin{2,12}
+ * @deprecated Use add_rectangle_to_path() instead
+ * reference.
+ *
+ * @newin{2,10}
*/
void add_rectangle_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle);
+#endif
+#ifndef GDKMM_DISABLE_DEPRECATED
/** Adds the given region to the current path of the context.
*
* @param context A cairo context.
* @param region A region to add to the path of the context.
*
- * @newin{2,12}
+ * @deprecated Use add_region_to_path() instead
+ *
+ * @newin{2,10}
*/
void add_region_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region);
+#endif
} //namespace Cairo
diff --git a/gdk/src/colormap.ccg b/gdk/src/colormap.ccg
index a9884d4..da8a4e7 100644
--- a/gdk/src/colormap.ccg
+++ b/gdk/src/colormap.ccg
@@ -35,5 +35,3 @@ void Colormap::free_color(Color& color)
}
} // namespace Gdk
-
-
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index be75ba7..2c13f6d 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -135,7 +135,6 @@ public:
_WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, WindowHints geom_mask), gdk_window_set_geometry_hints)
_WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id)
static void unset_sm_client_id();
-
_WRAP_METHOD(void begin_paint_rect(const Rectangle& rectangle), gdk_window_begin_paint_rect)
_WRAP_METHOD(void begin_paint_region(const Region& region), gdk_window_begin_paint_region)
_WRAP_METHOD(void end_paint(), gdk_window_end_paint)
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 03ee812..e326110 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -70,7 +70,7 @@ class Action
{
_CLASS_GOBJECT(Action, GtkAction, GTK_ACTION, Glib::Object, GObject)
_IMPLEMENTS_INTERFACE(Buildable)
-
+
protected:
/** Creates an empty action. */
_CTOR_DEFAULT
@@ -158,6 +158,7 @@ public:
_WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item)
_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.
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index 7c488b1..79760c5 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -21,8 +21,8 @@ _DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the ->children struct field.
-//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
+//Allow us to set the struct fields.
+//TODO: We probably need to remove the STL-style children() API.
#undef GSEAL_ENABLE
#m4 _POP()
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 73deafe..a0c697f 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -74,7 +74,6 @@ public:
*/
explicit Button(const StockID& stock_id);
-
_IGNORE(gtk_button_pressed, gtk_button_released, gtk_button_clicked, gtk_button_enter, gtk_button_leave) //deprecated
_WRAP_METHOD(void set_relief(ReliefStyle newstyle), gtk_button_set_relief)
diff --git a/gtk/src/buttonbox.ccg b/gtk/src/buttonbox.ccg
index 36a7549..d3781a7 100644
--- a/gtk/src/buttonbox.ccg
+++ b/gtk/src/buttonbox.ccg
@@ -42,56 +42,4 @@ HButtonBox::HButtonBox(ButtonBoxStyle layout, int spacing)
}
-int ButtonBox::get_child_min_width() const
-{
- int result = 0;
- gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-min-width", &result, (void*)0);
- return result;
-}
-
-void ButtonBox::set_child_min_width(const int& value)
-{
- //TODO: Find a way to set style properties in code, though this is deprecate anyway:
- gobj()->child_min_width = value;
-}
-
-int ButtonBox::get_child_min_height() const
-{
- int result = 0;
- gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-min-width", &result, (void*)0);
- return result;
-}
-
-void ButtonBox::set_child_min_height(const int& value)
-{
- //TODO: Find a way to set style properties in code, though this is deprecate anyway:
- gobj()->child_min_height = value;
-}
-
-int ButtonBox::get_child_ipadding_x() const
-{
- int result = 0;
- gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-internal-padding-x", &result, (void*)0);
- return result;
-}
-
-void ButtonBox::set_child_ipadding_x(const int& value)
-{
- //TODO: Find a way to set style properties in code, though this is deprecate anyway:
- gobj()->child_ipad_x = value;
-}
-
-int ButtonBox::get_child_ipadding_y() const
-{
- int result = 0;
- gtk_widget_style_get(const_cast<GtkWidget*>(GTK_WIDGET(gobj())), "child-internal-padding-y", &result, (void*)0);
- return result;
-}
-
-void ButtonBox::set_child_ipadding_y(const int& value)
-{
- //TODO: Find a way to set style properties in code, though this is deprecate anyway:
- gobj()->child_ipad_y = value;
-}
-
} // namespace Gtk
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index 3935b5a..93419e5 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -23,13 +23,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/box_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields for the style properties.
-//TODO: Find a better way to set them.
-//TODO: Remove these functions anyway in an ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
namespace Gtk
{
@@ -58,28 +51,6 @@ public:
_WRAP_METHOD(void set_child_secondary(Widget& child, bool is_secondary = true), gtk_button_box_set_child_secondary)
_WRAP_METHOD(bool get_child_secondary(const Gtk::Widget& child) const, gtk_button_box_get_child_secondary)
-//TODO: Replace (and deprecate) with use of properties:
-
-
- int get_child_min_width() const;
-
- //Note that the const int& is silly, but was once generated and must be kept for ABI.
- void set_child_min_width(const int& value);
-
- int get_child_min_height() const;
-
- //Note that the const int& is silly, but was once generated and must be kept for ABI.
- void set_child_min_height(const int& value);
-
- int get_child_ipadding_x() const;
-
- //Note that the const int& is silly, but was once generated and must be kept for ABI.
- void set_child_ipadding_x(const int& value);
-
- int get_child_ipadding_y() const;
-
- //Note that the const int& is silly, but was once generated and must be kept for ABI.
- void set_child_ipadding_y(const int& value);
_WRAP_PROPERTY("layout-style", ButtonBoxStyle)
};
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 121db0f..ccc5325 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -89,6 +89,8 @@ 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 align, float yalign), gtk_cell_renderer_set_alignment)
_WRAP_METHOD(void get_alignment(float& xalign, float& yalign) const, gtk_cell_renderer_get_alignment)
@@ -100,8 +102,6 @@ public:
_WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_cell_renderer_set_sensitive)
_WRAP_METHOD(bool get_sensitive() const, gtk_cell_renderer_get_sensitive)
- _IGNORE(gtk_cell_renderer_editing_canceled)
-
_WRAP_METHOD(void stop_editing(bool canceled = false), gtk_cell_renderer_stop_editing)
/** Returns the property that this CellRenderer renders.
diff --git a/gtk/src/colorselection.ccg b/gtk/src/colorselection.ccg
index bd3f54a..61726bc 100644
--- a/gtk/src/colorselection.ccg
+++ b/gtk/src/colorselection.ccg
@@ -139,9 +139,4 @@ ColorSelection::set_change_palette_hook(const ColorSelection::SlotChangePaletteH
return old_slot;
}
-ColorSelection* ColorSelectionDialog::get_colorsel()
-{
- return get_color_selection();
-}
-
} // namespace Gtk
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index 9cb279e..9211d2b 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -25,12 +25,6 @@ _PINCLUDE(gtkmm/private/dialog_p.h)
#include <gtkmm/dialog.h>
#include <gtkmm/button.h>
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields.
-//TODO: Remove these functions anyway in an ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
namespace Gtk
{
@@ -102,30 +96,6 @@ public:
_WRAP_METHOD(ColorSelection* get_color_selection(), gtk_color_selection_dialog_get_color_selection)
_WRAP_METHOD(const ColorSelection* get_color_selection() const, gtk_color_selection_dialog_get_color_selection)
-
-_DEPRECATE_IFDEF_START
- //TODO: Remove these in gtkmm 3. They use G_SEAL()ed struct fields.
-
- /** @deprecated: Use get_color_selection() instead.
- */
- ColorSelection* get_colorsel();
-
- /** @deprecated: Use get_color_selection() instead.
- */
- const ColorSelection* get_colorsel() const;
-
- /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
- */
- _MEMBER_GET_PTR(ok_button,ok_button,Button*,GtkWidget*)
-
- /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
- */
- _MEMBER_GET_PTR(cancel_button,cancel_button,Button*,GtkWidget*)
-
- /** @deprecated Use Gtk::Dialog::get_widget_for_response() instead.
- */
- _MEMBER_GET_PTR(help_button,help_button,Button*,GtkWidget*)
-_DEPRECATE_IFDEF_END
};
} // namespace Gtk
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 6ab8392..630414b 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -49,7 +49,7 @@ gtkmm_files_any_hg = \
clipboard.hg \
colorbutton.hg \
colorselection.hg \
- combobox.hg \
+ combobox.hg \
comboboxentry.hg \
container.hg \
dialog.hg \
diff --git a/gtk/src/fontselection.hg b/gtk/src/fontselection.hg
index 146207f..d525c15 100644
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@ -21,16 +21,6 @@ _DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/box_p.h)
_PINCLUDE(gtkmm/private/dialog_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-// So we can still wrap the (deprecated) widget.
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
-
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields.
-//TODO: Remove these functions anyway in an ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
#include <gtkmm/dialog.h>
#include <gtkmm/box.h>
@@ -92,29 +82,6 @@ public:
//TODO: Remove these accessors when we can break ABI.
//They probably all return null now anyway.
-
-_DEPRECATE_IFDEF_START
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_PTR(font_entry,font_entry,Entry*,GtkWidget*)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_PTR(font_style_entry,font_style_entry,Entry*,GtkWidget*)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_PTR(pixels_button,pixels_button,RadioButton*,GtkWidget*)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_PTR(points_button,points_button,RadioButton*,GtkWidget*)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_PTR(filter_button,filter_button,Button*,GtkWidget*)
-_DEPRECATE_IFDEF_END
-
//Note: The GdkFont "font" property is deprecated, or should be.
_WRAP_PROPERTY("font_name", Glib::ustring)
_WRAP_PROPERTY("preview_text", Glib::ustring)
@@ -150,8 +117,7 @@ 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)
- _WRAP_METHOD(Button* get_apply_button(), gtk_font_selection_dialog_get_apply_button)
- _WRAP_METHOD(const Button* get_apply_button() const, gtk_font_selection_dialog_get_apply_button, constversion)
+ _IGNORE(gtk_font_selection_dialog_get_apply_button) //deprecated
};
} // namespace Gtk
diff --git a/gtk/src/handlebox.ccg b/gtk/src/handlebox.ccg
index d7b1f11..3a7bb30 100644
--- a/gtk/src/handlebox.ccg
+++ b/gtk/src/handlebox.ccg
@@ -26,21 +26,4 @@
namespace Gtk
{
-_DEPRECATE_IFDEF_START
-bool HandleBox::is_float_window_mapped() const
-{
- return gobj()->float_window_mapped;
-}
-
-bool HandleBox::is_in_drag() const
-{
- return gobj()->in_drag;
-}
-
-bool HandleBox::shrinks_on_detach() const
-{
- return gobj()->shrink_on_detach;
-}
-_DEPRECATE_IFDEF_END
-
} /* namespace Gtk */
diff --git a/gtk/src/handlebox.hg b/gtk/src/handlebox.hg
index 6b313f5..fccbfef 100644
--- a/gtk/src/handlebox.hg
+++ b/gtk/src/handlebox.hg
@@ -23,12 +23,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields.
-//TODO: Remove these functions anyway in an ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
#m4 _CONVERSION(`int',`PositionType',`($2)$3')
namespace Gtk
@@ -64,28 +58,6 @@ public:
_WRAP_SIGNAL(void child_attached(Widget* child), "child_attached")
_WRAP_SIGNAL(void child_detached(Widget* child), "child_detached")
-_DEPRECATE_IFDEF_START
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_GOBJECT(bin_window, bin_window, Gdk::Window, GdkWindow*)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_GOBJECT(float_window, float_window, Gdk::Window, GdkWindow*)
-
- /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
- */
- bool is_float_window_mapped() const;
-
- /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
- */
- bool is_in_drag() const;
-
- /** @deprecated This method does not seem to be useful and will be removed from a future version of gtkmm, due to changes in GTK+.
- */
- bool shrinks_on_detach() const;
-_DEPRECATE_IFDEF_END
-
//_WRAP_PROPERTY("shadow", ShadowType); //deprecated.
_WRAP_PROPERTY("shadow-type", ShadowType)
_WRAP_PROPERTY("handle-position", PositionType)
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index b7e3987..a2cc1e8 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -58,7 +58,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)
diff --git a/gtk/src/menushell.hg b/gtk/src/menushell.hg
index bfd2d58..8146637 100644
--- a/gtk/src/menushell.hg
+++ b/gtk/src/menushell.hg
@@ -25,8 +25,8 @@ _PINCLUDE(gtkmm/menubar.h)
_PINCLUDE(gtkmm/window.h)
#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the ->children struct field.
-//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
+//Allow us to set the struct fields.
+//TODO: We probably need to remove the STL-style children() API.
#undef GSEAL_ENABLE
#m4 _POP()
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 5a42480..b3e8c09 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -18,12 +18,6 @@
_CONFIGINCLUDE(gtkmmconfig.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the ->children struct field.
-//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
#include <gtkmm/container.h>
#include <gtkmm/label.h>
//#include <gtk/gtknotebook.h>
@@ -33,6 +27,12 @@ _DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
#m4 _CONVERSION(guint,PositionType,`$2($3)')
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+//Allow us to set the struct fields.
+//TODO: We probably need to remove the STL-style children() API.
+#undef GSEAL_ENABLE
+#m4 _POP()
+
#ifndef DOXYGEN_SHOULD_SKIP_THIS
extern "C"
{
@@ -378,7 +378,9 @@ public:
_WRAP_METHOD(void set_menu_label(Widget& child, Widget& menu_label), gtk_notebook_set_menu_label)
_WRAP_METHOD(void set_menu_label_text(Widget& child, const Glib::ustring& menu_text), gtk_notebook_set_menu_label_text)
_WRAP_METHOD(Glib::ustring get_menu_label_text(Widget& child) const, gtk_notebook_get_menu_label_text)
+
_IGNORE(gtk_notebook_query_tab_label_packing, gtk_notebook_set_tab_label_packing) //deprecated
+
_WRAP_METHOD(void reorder_child(Widget& child, int position), gtk_notebook_reorder_child)
_WRAP_METHOD(bool get_tab_reorderable(Widget& child) const, gtk_notebook_get_tab_reorderable)
diff --git a/gtk/src/offscreenwindow.hg b/gtk/src/offscreenwindow.hg
index 636198f..a733626 100644
--- a/gtk/src/offscreenwindow.hg
+++ b/gtk/src/offscreenwindow.hg
@@ -16,9 +16,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
_CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/window.h>
diff --git a/gtk/src/pagesetup.hg b/gtk/src/pagesetup.hg
index 5ec7c5c..3c21d33 100644
--- a/gtk/src/pagesetup.hg
+++ b/gtk/src/pagesetup.hg
@@ -156,7 +156,7 @@ public:
_WRAP_METHOD(bool save_to_file(const std::string& file_name) const, gtk_page_setup_to_file, errthrow)
#m4 _CONVERSION(`Glib::KeyFile&', `GKeyFile*', __FR2P)
- _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_page_setup_to_key_file)
+ _WRAP_METHOD(void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const, gtk_page_setup_to_key_file)
/** This function adds the page setup from @a setup to @a key_file,
* in the group "Page Setup"
diff --git a/gtk/src/range.ccg b/gtk/src/range.ccg
index 3801fbe..68d18fc 100644
--- a/gtk/src/range.ccg
+++ b/gtk/src/range.ccg
@@ -75,6 +75,14 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor
}
#endif //GLIBMM_VFUNCS_ENABLED
+Gdk::Rectangle Range::get_range_rect() const
+{
+ Gdk::Rectangle result;
+ gtk_range_get_range_rect(const_cast<GtkRange*>(gobj()), result.gobj());
+ return result;
+}
+
+
} // namespace Gtk
diff --git a/gtk/src/range.hg b/gtk/src/range.hg
index 6a03903..59d01e6 100644
--- a/gtk/src/range.hg
+++ b/gtk/src/range.hg
@@ -128,6 +128,7 @@ public:
protected:
virtual void get_range_border_vfunc(Gtk::Border& border) const;
+
#m4begin
dnl /* get_range_border_vfunc is wrapped partially by hand (C callback is
dnl * custom), because this vfunc is a getter with a "return value" as
diff --git a/gtk/src/ruler.hg b/gtk/src/ruler.hg
index 8291568..4960ffa 100644
--- a/gtk/src/ruler.hg
+++ b/gtk/src/ruler.hg
@@ -25,12 +25,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/widget_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the struct fields.
-//TODO: We need to remove these methods anyway in a future ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
namespace Gtk
{
@@ -67,18 +61,6 @@ public:
_WRAP_METHOD(MetricType get_metric() const, gtk_ruler_get_metric)
_WRAP_METHOD(MetricType get_metric(), gtk_ruler_get_metric, deprecated "Use the const version")
-_DEPRECATE_IFDEF_START
-//TODO: Remove these when we can break ABI:
-
- /** @deprecated Use get_range() instead.
- */
- _MEMBER_GET(range_lower,lower,double,double)
-
- /** @deprecated Use get_range() instead.
- */
- _MEMBER_GET(range_upper,upper,double,double)
-_DEPRECATE_IFDEF_END
-
/** sets the range of the ruler.
* <i>upper</i> and <i>lower</i> arguments denote the extents of the Ruler.
* <i>max_size</i> is the largest number displayed by the ruler.
diff --git a/gtk/src/scalebutton.hg b/gtk/src/scalebutton.hg
index afb0a9d..ec57060 100644
--- a/gtk/src/scalebutton.hg
+++ b/gtk/src/scalebutton.hg
@@ -43,6 +43,7 @@ class ScaleButton
{
_CLASS_GTKOBJECT(ScaleButton, GtkScaleButton, GTK_SCALE_BUTTON, Gtk::Button, GtkButton)
_IMPLEMENTS_INTERFACE(Orientable)
+
public:
_WRAP_CTOR(ScaleButton(IconSize size, double min, double max, double step, const Glib::StringArrayHandle& icons), gtk_scale_button_new)
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index 484e6b7..754d5ca 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -23,12 +23,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the struct fields.
-//TODO: W need to remove these methods anyway in a future ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
namespace Gtk
{
@@ -96,16 +90,6 @@ public:
_WRAP_METHOD(HScrollbar* get_hscrollbar(), gtk_scrolled_window_get_hscrollbar)
_WRAP_METHOD(const HScrollbar* get_hscrollbar() const, gtk_scrolled_window_get_hscrollbar)
-_DEPRECATE_IFDEF_START
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET(vscrollbar_visible,vscrollbar_visible,bool,guint)
-
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET(hscrollbar_visible,hscrollbar_visible,bool,guint)
-_DEPRECATE_IFDEF_END
-
//Keybinding signals:
_IGNORE_SIGNAL("scroll_child")
_IGNORE_SIGNAL("move_focus_out")
diff --git a/gtk/src/table.hg b/gtk/src/table.hg
index bdf030f..fe9e83a 100644
--- a/gtk/src/table.hg
+++ b/gtk/src/table.hg
@@ -26,8 +26,8 @@ _DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the ->children struct field.
-//TODO: We probably need to remove the entire STL-style children() API in a future ABI break.
+//Allow us to set the struct fields.
+//TODO: We probably need to remove the STL-style children() API.
#undef GSEAL_ENABLE
#m4 _POP()
diff --git a/gtk/src/tearoffmenuitem.ccg b/gtk/src/tearoffmenuitem.ccg
index 0b693e8..dc63205 100644
--- a/gtk/src/tearoffmenuitem.ccg
+++ b/gtk/src/tearoffmenuitem.ccg
@@ -25,9 +25,4 @@
namespace Gtk
{
-bool TearoffMenuItem::is_torn_off() const
-{
- return gobj()->torn_off;
-}
-
} /* namespace Gtk */
diff --git a/gtk/src/tearoffmenuitem.hg b/gtk/src/tearoffmenuitem.hg
index 1c99ebb..6d263fb 100644
--- a/gtk/src/tearoffmenuitem.hg
+++ b/gtk/src/tearoffmenuitem.hg
@@ -24,11 +24,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/menuitem_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use the struct fields.
-//TODO: We need to remove these methods anyway in a future ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
namespace Gtk
{
@@ -44,12 +39,6 @@ class TearoffMenuItem : public MenuItem
_CLASS_GTKOBJECT(TearoffMenuItem,GtkTearoffMenuItem,GTK_TEAROFF_MENU_ITEM,Gtk::MenuItem,GtkMenuItem)
public:
_CTOR_DEFAULT
-
-_DEPRECATE_IFDEF_START
- /** @deprecated This method was apparently not useful and will be removed in a later gtkmm version, due to changes in GTK+.
- */
- bool is_torn_off() const;
-_DEPRECATE_IFDEF_END
};
} /* namespace Gtk */
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 65ae538..e284987 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -22,6 +22,8 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/bin.h>
#include <gtkmm/activatable.h>
+#include <gtkmm/tooltips.h>
+#include <gtkmm/sizegroup.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 0a68813..24b90ce 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -553,9 +553,7 @@ public:
_WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_tree_view_get_visible_rect)
- _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const, gtk_tree_view_widget_to_tree_coords)
-
- _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords)
+ _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/widget.ccg b/gtk/src/widget.ccg
index 01202c6..e0174bb 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -198,7 +198,7 @@ void Widget::unset_composite_name()
void Widget::realize_if_needed()
{
- if(!is_realized())
+ if(!get_realized())
realize();
}
@@ -278,84 +278,6 @@ void Widget::unset_cursor()
gtk_widget_modify_cursor(gobj(), 0, 0);
}
-_DEPRECATE_IFDEF_START
-//deprecated:
-bool Widget::has_no_window() const
- { return !get_has_window(); }
-
-//deprecated:
-bool Widget::is_realized() const
- { return get_realized(); }
-
-//deprecated:
-bool Widget::is_mapped() const
- { return get_mapped(); }
-
-//deprecated:
-bool Widget::is_drawable() const
-{
- return get_is_drawable();
-}
-
-//deprecated:
-bool Widget::receives_default() const
-{
- return get_receives_default();
-}
-
-//deprecated:
-bool Widget::is_toplevel() const
-{
- return get_is_toplevel();
-}
-
-//deprecated:
-bool Widget::is_visible() const
- { return get_visible(); }
-
-//deprecated:
-bool Widget::sensitive() const
- { return get_sensitive(); }
-
-//deprecated:
-bool Widget::app_paintable() const
- { return get_app_paintable(); }
-
-//deprecated:
-bool Widget::double_buffered() const
- { return get_double_buffered(); }
-
-//deprecated:
-bool Widget::rc_style() const
- { return has_rc_style(); }
-
-//deprecated:
-bool Widget::is_composite_child() const
-{
- return property_composite_child().get_value();
-}
-
-//deprecated:
-bool Widget::parent_sensitive() const
-{
- const Gtk::Widget* parent = get_parent();
- if(!parent)
- return false;
-
- return parent->get_sensitive();
-}
-
-WidgetFlags Widget::get_flags() const
- { return static_cast<WidgetFlags>(GTK_WIDGET_FLAGS(gobj())); }
-
-void Widget::set_flags(WidgetFlags flags)
- { GTK_WIDGET_SET_FLAGS(gobj(), static_cast<guint32>(flags)); }
-
-void Widget::unset_flags(WidgetFlags flags)
- { GTK_WIDGET_UNSET_FLAGS(gobj(), static_cast<guint32>(flags)); }
-
-_DEPRECATE_IFDEF_END
-
Allocation Widget::get_allocation() const
{
Allocation allocation;
@@ -363,9 +285,6 @@ Allocation Widget::get_allocation() const
return allocation;
}
-
-
-
int Widget::get_width() const
{ return get_allocation().get_width(); }
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 5ca3df0..004551f 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -35,10 +35,12 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <gdkmm/screen.h>
#include <gtkmm/enums.h>
#include <gdkmm/display.h>
+//#include <gtkmm/style.h>
#include <gtkmm/targetlist.h>
#include <gtkmm/rc.h>
#include <gtkmm/object.h>
#include <gtkmm/clipboard.h>
+//#include <gtkmm/action.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/object_p.h)
@@ -188,16 +190,12 @@ public:
_WRAP_METHOD(void set_can_focus(bool can_focus = true), gtk_widget_set_can_focus)
_WRAP_METHOD(bool get_can_focus() const, gtk_widget_get_can_focus)
- _WRAP_METHOD(bool can_focus() const, gtk_widget_get_can_focus,
- deprecated "Replaced by get_can_focus().")
_WRAP_METHOD(bool has_focus() const, gtk_widget_has_focus)
_WRAP_METHOD(bool is_focus() const, gtk_widget_is_focus)
_WRAP_METHOD(void grab_focus(), gtk_widget_grab_focus)
_WRAP_METHOD(void set_can_default(bool can_default = true), gtk_widget_set_can_default)
_WRAP_METHOD(bool get_can_default() const, gtk_widget_get_can_default)
- _WRAP_METHOD(bool can_default() const, gtk_widget_get_can_default,
- deprecated "Replaced by get_can_default().")
_WRAP_METHOD(bool has_default() const, gtk_widget_has_default)
_WRAP_METHOD(void grab_default(), gtk_widget_grab_default)
_WRAP_METHOD(void set_receives_default(bool receives_default = true), gtk_widget_set_receives_default)
@@ -509,7 +507,7 @@ public:
_WRAP_METHOD(void remove_mnemonic_label(Widget& label), gtk_widget_remove_mnemonic_label)
//TODO: Should drag_get_data() be const?
- _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
+ _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
_WRAP_METHOD(void drag_highlight(), gtk_drag_highlight)
_WRAP_METHOD(void drag_unhighlight(), gtk_drag_unhighlight)
@@ -582,82 +580,6 @@ public:
_WRAP_METHOD(void set_has_tooltip(bool has_tooltip = TRUE), gtk_widget_set_has_tooltip)
_WRAP_METHOD(bool get_has_tooltip() const, gtk_widget_get_has_tooltip)
-_DEPRECATE_IFDEF_START
- /** @deprecated Use !get_has_window() instead.
- */
- bool has_no_window() const;
-
- /** @deprecated Use get_realized() instead.
- */
- bool is_realized() const;
-
- /** @deprecated Use get_mapped() instead.
- */
- bool is_mapped() const;
-
- /** @deprecated: Use get_is_toplevel() instead.
- */
- bool is_toplevel() const;
-
- /** @deprecated: Use get_is_drawable() instead.
- */
- bool is_drawable() const;
-
- /** @deprecated: Use get_visible() instead.
- */
- bool is_visible() const;
-
- /** @deprecated: Use get_sensitive() instead.
- */
- bool sensitive() const;
-
- /** @deprecated: Use get_app_paintable() instead.
- */
- bool app_paintable() const;
-
- /** @deprecated: Use get_receives_default() instead.
- */
- bool receives_default() const;
-
- /** @deprecated: Use get_double_buffered() instead.
- */
- bool double_buffered() const;
-
- /** @deprecated Call get_sensitive() on the result of get_parent() instead.
- */
- bool parent_sensitive() const;
-
- _DEPRECATE_IFDEF_END
-
- /** @deprecated: Use has_rc_style() instead.
- */
- bool rc_style() const;
-
- /** @deprecated: Use the proper method to test individual states, such as
- * get_app_paintable(), get_can_default(),
- * get_can_focus(), get_double_buffered(),
- * has_default(), is_drawable(),
- * has_focus(), has_grab(), get_mapped(),
- * get_has_window(), has_rc_style(),
- * get_realized(), get_receives_default(),
- * get_sensitive(), is_sensitive(),
- * is_toplevel() or get_visible().
- */
- WidgetFlags get_flags() const;
-
- //TODO: Document the deprecation when GTK+ does.
- void set_flags(WidgetFlags flags);
-
- //TODO: Document the deprecation when GTK+ does.
- void unset_flags(WidgetFlags flags);
-
- //TODO: Remove this when we can break ABI:
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
-
- _DEPRECATE_IFDEF_END
-
int get_width() const;
int get_height() const;
@@ -877,7 +799,7 @@ dnl
_WRAP_SIGNAL(void drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& context), "drag_data_delete")
_WRAP_SIGNAL(bool drag_failed(const Glib::RefPtr<Gdk::DragContext>& context, DragResult result), "drag_failed", no_default_handler)
-
+
/** The drag_leave signal is emitted on the drop site when the cursor leaves the widget.
* A typical reason to connect to this signal is to undo things done in the drag_motion signal handler,
* e.g. undo highlighting with drag_unhighlight().
@@ -947,13 +869,15 @@ dnl
*/
_WRAP_SIGNAL(void drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time), "drag_data_received")
+ //_WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated)
+
_WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed")
_WRAP_SIGNAL(void composited_changed(), "composited_changed", no_default_handler)
//TODO: The signal_id is very C-like here:
//_WRAP_SIGNAL(bool can_activate_accel(guint signal_id), "can_activate_accel")
-
+
_WRAP_SIGNAL(bool popup_menu(), "popup_menu", no_default_handler) //Note that popup-menu is a keybinding signal, but is really meant to be wrapped.
//Keybinding signals:
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 5a20318..bf432f3 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -43,20 +43,6 @@ Glib::RefPtr<AccelGroup> Window::get_accel_group()
return accel_group_;
}
-_DEPRECATE_IFDEF_START
-
-bool Window::is_toplevel() const
-{
- return Widget::get_is_toplevel();
-}
-
-bool Window::is_popup() const
-{
- return get_window_type() == WINDOW_POPUP;
-}
-
-_DEPRECATE_IFDEF_END
-
void Window::raise()
{
get_window()->raise();
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 237c9c2..8e80b61 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -26,12 +26,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields.
-//TODO: Remove these functions anyway in an ABI break.
-#undef GSEAL_ENABLE
-#m4 _POP()
-
namespace Gtk
{
@@ -99,23 +93,6 @@ public:
_WRAP_PROPERTY("focus-on-map", bool)
_WRAP_PROPERTY("deletable", bool)
-_DEPRECATE_IFDEF_START
-
- /** @deprecated Use Gtk::Widget::is_toplevel().
- */
- bool is_toplevel() const;
-
- /** @deprecated: Use get_window_type().
- */
- bool is_popup() const;
-
- // This is special to the GTK+ linux-fb port.
- /** @deprecated You should not need to call this method.
- */
- _MEMBER_GET_GOBJECT(frame, frame, Gdk::Window, GdkWindow*)
-
-_DEPRECATE_IFDEF_END
-
_WRAP_SIGNAL(void set_focus(Widget* focus), "set_focus")
_WRAP_SIGNAL(bool frame_event(GdkEvent* event), "frame_event")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]