From 79bca169e5eec0f2481e9ce0dd1a664ab2d6ced9 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 6 Jul 2013 15:44:21 +0000 Subject: [PATCH] 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 --- Makefile.in | 4 +--- build/bakefiles/files.bkl | 1 - include/wx/gtk/{ => private}/treeentry_gtk.h | 0 src/gtk/checklst.cpp | 3 --- src/gtk/listbox.cpp | 2 +- src/gtk/treeentry_gtk.c | 2 +- 6 files changed, 3 insertions(+), 9 deletions(-) rename include/wx/gtk/{ => private}/treeentry_gtk.h (100%) 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/treeentry_gtk.h b/include/wx/gtk/private/treeentry_gtk.h similarity index 100% rename from include/wx/gtk/treeentry_gtk.h rename to include/wx/gtk/private/treeentry_gtk.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 -- 2.45.2