From: Paul Cornett Date: Sat, 6 Jul 2013 15:58:42 +0000 (+0000) Subject: remove empty GtkTreeEntryClass X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3540b72b5fb594e79ae307edd6397731d27b3162 remove empty GtkTreeEntryClass git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/private/treeentry_gtk.h b/include/wx/gtk/private/treeentry_gtk.h index 2bd15dc5af..18ed5181ae 100644 --- a/include/wx/gtk/private/treeentry_gtk.h +++ b/include/wx/gtk/private/treeentry_gtk.h @@ -1,5 +1,5 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/treeentry_gtk.h +// Name: wx/gtk/private/treeentry_gtk.h // Purpose: GtkTreeEntry - a string/userdata combo for use with treeview // Author: Ryan Norton // Id: $Id$ @@ -7,8 +7,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifndef __GTK_TREE_ENTRY_H__ -#define __GTK_TREE_ENTRY_H__ +#ifndef _WX_GTK_TREE_ENTRY_H_ +#define _WX_GTK_TREE_ENTRY_H_ #ifdef __cplusplus extern "C" { @@ -20,11 +20,9 @@ extern "C" { #define GTK_TYPE_TREE_ENTRY (gtk_tree_entry_get_type()) #define GTK_TREE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_tree_entry_get_type (), GtkTreeEntry)) -#define GTK_TREE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, gtk_tree_entry_get_type (), GtkTreeEntryClass)) #define GTK_IS_TREE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_tree_entry_get_type ())) typedef struct _GtkTreeEntry GtkTreeEntry; -typedef struct _GtkTreeEntryClass GtkTreeEntryClass; typedef void (*GtkTreeEntryDestroy) (GtkTreeEntry* entry, gpointer context); @@ -38,11 +36,6 @@ struct _GtkTreeEntry gpointer destroy_func_data; /* context passed to destroy_func */ }; -struct _GtkTreeEntryClass -{ - GObjectClass parent; -}; - WXDLLIMPEXP_CORE GtkTreeEntry* gtk_tree_entry_new (void); @@ -73,4 +66,4 @@ void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry, } #endif /* __cplusplus */ -#endif /* __GTK_TREE_ENTRY_H__ */ +#endif /* _WX_GTK_TREE_ENTRY_H_ */ diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c index 6955a126ca..5bdae1daa6 100644 --- a/src/gtk/treeentry_gtk.c +++ b/src/gtk/treeentry_gtk.c @@ -55,7 +55,7 @@ gtk_tree_entry_get_type () { const GTypeInfo tree_entry_info = { - sizeof (GtkTreeEntryClass), + sizeof(GObjectClass), NULL, /* base_init */ NULL, /* base_finalize */ gtk_tree_entry_class_init,