From: Paul Cornett Date: Sat, 6 Jul 2013 15:44:21 +0000 (+0000) Subject: move treeentry_gtk.h to include/wx/gtk/private/ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79bca169e5eec0f2481e9ce0dd1a664ab2d6ced9?ds=inline move treeentry_gtk.h to include/wx/gtk/private/ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 6ab453d691..b81eb4524b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2991,7 +2991,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/gtk/textctrl.h \ wx/gtk/textentry.h \ wx/gtk/tglbtn.h \ - wx/gtk/treeentry_gtk.h \ wx/generic/fontdlgg.h \ wx/gtk/gnome/gprint.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR) @@ -3045,8 +3044,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \ wx/gtk/toolbar.h \ wx/gtk/textctrl.h \ wx/gtk/textentry.h \ - wx/gtk/tglbtn.h \ - wx/gtk/treeentry_gtk.h + wx/gtk/tglbtn.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR) COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/generic/clrpickerg.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 9a12df6afd..787e7c64c2 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1276,7 +1276,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/textctrl.h wx/gtk/textentry.h wx/gtk/tglbtn.h - wx/gtk/treeentry_gtk.h $(GTK_HDR) diff --git a/include/wx/gtk/private/treeentry_gtk.h b/include/wx/gtk/private/treeentry_gtk.h new file mode 100644 index 0000000000..2bd15dc5af --- /dev/null +++ b/include/wx/gtk/private/treeentry_gtk.h @@ -0,0 +1,76 @@ +/* /////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/treeentry_gtk.h +// Purpose: GtkTreeEntry - a string/userdata combo for use with treeview +// Author: Ryan Norton +// Id: $Id$ +// Copyright: (c) 2006 Ryan Norton +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////// */ + +#ifndef __GTK_TREE_ENTRY_H__ +#define __GTK_TREE_ENTRY_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include /* for gpointer and gchar* etc. */ + +#include "wx/dlimpexp.h" + +#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); + +struct _GtkTreeEntry +{ + GObject parent; /* object instance */ + gchar* label; /* label - always copied by this object except on get */ + gchar* collate_key; /* collate key used for string comparisons/sorting */ + gpointer userdata; /* untouched userdata */ + GtkTreeEntryDestroy destroy_func; /* called upon destruction - use for freeing userdata etc. */ + gpointer destroy_func_data; /* context passed to destroy_func */ +}; + +struct _GtkTreeEntryClass +{ + GObjectClass parent; +}; + +WXDLLIMPEXP_CORE +GtkTreeEntry* gtk_tree_entry_new (void); + +WXDLLIMPEXP_CORE +GType gtk_tree_entry_get_type (void); + +WXDLLIMPEXP_CORE +gchar* gtk_tree_entry_get_collate_key (GtkTreeEntry* entry); + +WXDLLIMPEXP_CORE +gchar* gtk_tree_entry_get_label (GtkTreeEntry* entry); + +WXDLLIMPEXP_CORE +gpointer gtk_tree_entry_get_userdata (GtkTreeEntry* entry); + +WXDLLIMPEXP_CORE +void gtk_tree_entry_set_label (GtkTreeEntry* entry, const gchar* label); + +WXDLLIMPEXP_CORE +void gtk_tree_entry_set_userdata (GtkTreeEntry* entry, gpointer userdata); + +WXDLLIMPEXP_CORE +void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry, + GtkTreeEntryDestroy destroy_func, + gpointer destroy_func_data); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GTK_TREE_ENTRY_H__ */ diff --git a/include/wx/gtk/treeentry_gtk.h b/include/wx/gtk/treeentry_gtk.h deleted file mode 100644 index 2bd15dc5af..0000000000 --- a/include/wx/gtk/treeentry_gtk.h +++ /dev/null @@ -1,76 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/treeentry_gtk.h -// Purpose: GtkTreeEntry - a string/userdata combo for use with treeview -// Author: Ryan Norton -// Id: $Id$ -// Copyright: (c) 2006 Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef __GTK_TREE_ENTRY_H__ -#define __GTK_TREE_ENTRY_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include /* for gpointer and gchar* etc. */ - -#include "wx/dlimpexp.h" - -#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); - -struct _GtkTreeEntry -{ - GObject parent; /* object instance */ - gchar* label; /* label - always copied by this object except on get */ - gchar* collate_key; /* collate key used for string comparisons/sorting */ - gpointer userdata; /* untouched userdata */ - GtkTreeEntryDestroy destroy_func; /* called upon destruction - use for freeing userdata etc. */ - gpointer destroy_func_data; /* context passed to destroy_func */ -}; - -struct _GtkTreeEntryClass -{ - GObjectClass parent; -}; - -WXDLLIMPEXP_CORE -GtkTreeEntry* gtk_tree_entry_new (void); - -WXDLLIMPEXP_CORE -GType gtk_tree_entry_get_type (void); - -WXDLLIMPEXP_CORE -gchar* gtk_tree_entry_get_collate_key (GtkTreeEntry* entry); - -WXDLLIMPEXP_CORE -gchar* gtk_tree_entry_get_label (GtkTreeEntry* entry); - -WXDLLIMPEXP_CORE -gpointer gtk_tree_entry_get_userdata (GtkTreeEntry* entry); - -WXDLLIMPEXP_CORE -void gtk_tree_entry_set_label (GtkTreeEntry* entry, const gchar* label); - -WXDLLIMPEXP_CORE -void gtk_tree_entry_set_userdata (GtkTreeEntry* entry, gpointer userdata); - -WXDLLIMPEXP_CORE -void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry, - GtkTreeEntryDestroy destroy_func, - gpointer destroy_func_data); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GTK_TREE_ENTRY_H__ */ diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index fe5cfb0414..46015fc132 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -14,10 +14,7 @@ #if wxUSE_CHECKLISTBOX #include "wx/checklst.h" -#include "wx/gtk/private.h" -#include "wx/gtk/treeentry_gtk.h" -#include #include //----------------------------------------------------------------------------- diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 677629a1f1..07155104e7 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -33,7 +33,7 @@ #include "wx/gtk/private.h" #include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/object.h" -#include "wx/gtk/treeentry_gtk.h" +#include "wx/gtk/private/treeentry_gtk.h" #include #ifdef __WXGTK3__ diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c index f4f1b299af..191c563764 100644 --- a/src/gtk/treeentry_gtk.c +++ b/src/gtk/treeentry_gtk.c @@ -14,7 +14,7 @@ typedef pid_t GPid; #define GSEAL(x) x #endif -#include "wx/gtk/treeentry_gtk.h" +#include "wx/gtk/private/treeentry_gtk.h" /* GtkTreeEntry