gtkmm r1064 - in trunk: . gtk/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkmm r1064 - in trunk: . gtk/src
- Date: Sat, 6 Dec 2008 19:20:04 +0000 (UTC)
Author: murrayc
Date: Sat Dec 6 19:20:04 2008
New Revision: 1064
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1064&view=rev
Log:
2008-12-06 Murray Cumming <murrayc murrayc com>
* gtk/src/container.hg:
* gtk/src/gtk_vfuncs.defs: Use GType instead of GtkType for the
child_type_vfunc() return type, because that seems to have changed in
GTK+ and GtkType is deprecated.Likewise, use GDestroyNotify in other
vfuncs instead of GtkDestroyNotify.
This should allow soure code to use gtkmm if it declares
GTK_DISABLE_DEPRECATED.
Bug #562893 (DÃnes FaluvÃgi)
Modified:
trunk/ChangeLog
trunk/gtk/src/container.hg
trunk/gtk/src/gtk_vfuncs.defs
trunk/gtk/src/treesortable.hg
Modified: trunk/gtk/src/container.hg
==============================================================================
--- trunk/gtk/src/container.hg (original)
+++ trunk/gtk/src/container.hg Sat Dec 6 19:20:04 2008
@@ -104,7 +104,7 @@
//_WRAP_METHOD(void foreach_(GtkCallback callback,gpointer data),gtk_container_foreach)
/// (internal) Operate on contained items (see foreach())
- //_WRAP_METHOD(void foreach_full_(GtkCallback callback,GtkCallbackMarshal marshal, gpointer data,GtkDestroyNotify notify),gtk_container_foreach_full)
+ //_WRAP_METHOD(void foreach_full_(GtkCallback callback,GtkCallbackMarshal marshal, gpointer data,GDestroyNotify notify),gtk_container_foreach_full)
_WRAP_METHOD(Glib::ListHandle<Widget*> get_children(), gtk_container_get_children)
_WRAP_METHOD(Glib::ListHandle<const Widget*> get_children() const, gtk_container_get_children)
@@ -174,7 +174,7 @@
protected:
_CTOR_DEFAULT()
- _WRAP_VFUNC(GtkType child_type() const, child_type)
+ _WRAP_VFUNC(GType child_type() const, child_type)
_WRAP_VFUNC(void forall(gboolean include_internals, GtkCallback callback, gpointer callback_data), forall)
//TODO: What is this?
_WRAP_VFUNC(char* composite_name(GtkWidget* child), composite_name)
Modified: trunk/gtk/src/gtk_vfuncs.defs
==============================================================================
--- trunk/gtk/src/gtk_vfuncs.defs (original)
+++ trunk/gtk/src/gtk_vfuncs.defs Sat Dec 6 19:20:04 2008
@@ -205,7 +205,7 @@
(define-vfunc child_type
(of-object "GtkContainer")
- (return-type "GtkType")
+ (return-type "GType")
)
@@ -929,7 +929,7 @@
'("int" "sort_column_id")
'("GtkTreeIterCompareFunc" "func")
'("gpointer" "data")
- '("GtkDestroyNotify" "destroy")
+ '("GDestroyNotify" "destroy")
)
)
@@ -939,7 +939,7 @@
(parameters
'("GtkTreeIterCompareFunc" "func")
'("gpointer" "data")
- '("GtkDestroyNotify" "destroy")
+ '("GDestroyNotify" "destroy")
)
)
Modified: trunk/gtk/src/treesortable.hg
==============================================================================
--- trunk/gtk/src/treesortable.hg (original)
+++ trunk/gtk/src/treesortable.hg Sat Dec 6 19:20:04 2008
@@ -116,8 +116,8 @@
protected:
_WRAP_VFUNC(bool get_sort_column_id(int* sort_column_id, SortType* order) const, get_sort_column_id)
_WRAP_VFUNC(void set_sort_column_id(int sort_column_id, SortType order), set_sort_column_id)
- _WRAP_VFUNC(void set_sort_func(int sort_column_id, GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy), set_sort_func)
- _WRAP_VFUNC(void set_default_sort_func(GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy), set_default_sort_func)
+ _WRAP_VFUNC(void set_sort_func(int sort_column_id, GtkTreeIterCompareFunc func, void* data, GDestroyNotify destroy), set_sort_func)
+ _WRAP_VFUNC(void set_default_sort_func(GtkTreeIterCompareFunc func, void* data, GDestroyNotify destroy), set_default_sort_func)
_WRAP_VFUNC(bool has_default_sort_func() const, has_default_sort_func)
_WRAP_VFUNC(void sort_column_changed() const, sort_column_changed)
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]