/* ///////////////////////////////////////////////////////////////////////////
-// 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$
 // 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" {
 
 #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);
 
     gpointer destroy_func_data;         /* context passed to destroy_func */
 };
 
-struct _GtkTreeEntryClass
-{
-    GObjectClass parent;
-};
-
 WXDLLIMPEXP_CORE
 GtkTreeEntry* gtk_tree_entry_new        (void);
 
 }
 #endif /* __cplusplus */
 
-#endif /* __GTK_TREE_ENTRY_H__ */
+#endif /* _WX_GTK_TREE_ENTRY_H_ */
 
     {
         const GTypeInfo tree_entry_info =
         {
-            sizeof (GtkTreeEntryClass),
+            sizeof(GObjectClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */
             gtk_tree_entry_class_init,