From c1f57e4e045c2b6535dd5114a54a5594ebd63f8f Mon Sep 17 00:00:00 2001
From: fjoe <fjoe@FreeBSD.org>
Date: Wed, 29 Nov 2006 18:44:58 +0000
Subject: Set wxgtk2.4 include directory to ${PREFIX}/include/wx-2.4/wx. This
 resolves header conflicts with wxgtk2-2.6+.

PR:		100465
---
 x11-toolkits/wxgtk24/Makefile  |   5 +-
 x11-toolkits/wxgtk24/pkg-plist | 738 +++++++++++++++++++++--------------------
 2 files changed, 373 insertions(+), 370 deletions(-)

(limited to 'x11-toolkits/wxgtk24')

diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index d628726e77b0..1b8df0938b19 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.4.2
-PORTREVISION?=	12
+PORTREVISION?=	14
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,7 +34,8 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libtiff=sys \
 		--with-zlib=sys \
 		--with-opengl\
-		--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
+		--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}\
+		--includedir=${PREFIX}/include/wx-2.4
 CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
 			  -I${LOCALBASE}/include \
 			  -I${X11BASE}/include \
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index 426a83b11df6..3142aab31822 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -1,368 +1,368 @@
 bin/wxgtk2-2.4-config
-include/wx/accel.h
-include/wx/app.h
-include/wx/arrimpl.cpp
-include/wx/artprov.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/brush.h
-include/wx/buffer.h
-include/wx/build.h
-include/wx/busyinfo.h
-include/wx/button.h
-include/wx/calctrl.h
-include/wx/caret.h
-include/wx/checkbox.h
-include/wx/checklst.h
-include/wx/chkconf.h
-include/wx/choicdlg.h
-include/wx/choice.h
-include/wx/clipbrd.h
-include/wx/clntdata.h
-include/wx/cmdline.h
-include/wx/cmdproc.h
-include/wx/cmndata.h
-include/wx/colordlg.h
-include/wx/colour.h
-include/wx/combobox.h
-include/wx/confbase.h
-include/wx/config.h
-include/wx/containr.h
-include/wx/control.h
-include/wx/cshelp.h
-include/wx/ctrlsub.h
-include/wx/cursor.h
-include/wx/dataobj.h
-include/wx/date.h
-include/wx/datetime.h
-include/wx/datetime.inl
-include/wx/datstrm.h
-include/wx/db.h
-include/wx/dbgrid.h
-include/wx/dbkeyg.h
-include/wx/dbtable.h
-include/wx/dc.h
-include/wx/dcbuffer.h
-include/wx/dcclient.h
-include/wx/dcmemory.h
-include/wx/dcprint.h
-include/wx/dcps.h
-include/wx/dcscreen.h
-include/wx/dde.h
-include/wx/debug.h
-include/wx/defs.h
-include/wx/dialog.h
-include/wx/dialup.h
-include/wx/dir.h
-include/wx/dirctrl.h
-include/wx/dirdlg.h
-include/wx/dnd.h
-include/wx/docmdi.h
-include/wx/docview.h
-include/wx/dragimag.h
-include/wx/dynarray.h
-include/wx/dynlib.h
-include/wx/dynload.h
-include/wx/effects.h
-include/wx/encconv.h
-include/wx/event.h
-include/wx/expr.h
-include/wx/fdrepdlg.h
-include/wx/features.h
-include/wx/ffile.h
-include/wx/file.h
-include/wx/fileconf.h
-include/wx/filedlg.h
-include/wx/filefn.h
-include/wx/filename.h
-include/wx/filesys.h
-include/wx/font.h
-include/wx/fontdlg.h
-include/wx/fontenc.h
-include/wx/fontenum.h
-include/wx/fontmap.h
-include/wx/fontutil.h
-include/wx/frame.h
-include/wx/fs_inet.h
-include/wx/fs_mem.h
-include/wx/fs_zip.h
-include/wx/gauge.h
-include/wx/gdicmn.h
-include/wx/gdiobj.h
-include/wx/generic/accel.h
-include/wx/generic/calctrl.h
-include/wx/generic/caret.h
-include/wx/generic/choicdgg.h
-include/wx/generic/colrdlgg.h
-include/wx/generic/dcpsg.h
-include/wx/generic/dirctrlg.h
-include/wx/generic/dirdlgg.h
-include/wx/generic/dragimgg.h
-include/wx/generic/fdrepdlg.h
-include/wx/generic/filedlgg.h
-include/wx/generic/fontdlgg.h
-include/wx/generic/grid.h
-include/wx/generic/gridctrl.h
-include/wx/generic/gridg.h
-include/wx/generic/helpext.h
-include/wx/generic/helphtml.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/paletteg.h
-include/wx/generic/panelg.h
-include/wx/generic/printps.h
-include/wx/generic/prntdlgg.h
-include/wx/generic/progdlgg.h
-include/wx/generic/sashwin.h
-include/wx/generic/scrolwin.h
-include/wx/generic/spinctlg.h
-include/wx/generic/splash.h
-include/wx/generic/splitter.h
-include/wx/generic/statusbr.h
-include/wx/generic/tabg.h
-include/wx/generic/textdlgg.h
-include/wx/generic/timer.h
-include/wx/generic/treectlg.h
-include/wx/generic/wizard.h
-include/wx/geometry.h
-include/wx/gifdecod.h
-include/wx/glcanvas.h
-include/wx/grid.h
-include/wx/gsocket.h
-include/wx/gtk/accel.h
-include/wx/gtk/app.h
-include/wx/gtk/bitmap.h
-include/wx/gtk/bmpbuttn.h
-include/wx/gtk/brush.h
-include/wx/gtk/button.h
-include/wx/gtk/checkbox.h
-include/wx/gtk/checklst.h
-include/wx/gtk/choice.h
-include/wx/gtk/clipbrd.h
-include/wx/gtk/colour.h
-include/wx/gtk/combobox.h
-include/wx/gtk/control.h
-include/wx/gtk/cursor.h
-include/wx/gtk/dataform.h
-include/wx/gtk/dataobj.h
-include/wx/gtk/dataobj2.h
-include/wx/gtk/dc.h
-include/wx/gtk/dcclient.h
-include/wx/gtk/dcmemory.h
-include/wx/gtk/dcscreen.h
-include/wx/gtk/dialog.h
-include/wx/gtk/dnd.h
-include/wx/gtk/filedlg.h
-include/wx/gtk/font.h
-include/wx/gtk/fontdlg.h
-include/wx/gtk/frame.h
-include/wx/gtk/gauge.h
-include/wx/gtk/gdiobj.h
-include/wx/gtk/glcanvas.h
-include/wx/gtk/icon.h
-include/wx/gtk/joystick.h
-include/wx/gtk/listbox.h
-include/wx/gtk/mdi.h
-include/wx/gtk/menu.h
-include/wx/gtk/menuitem.h
-include/wx/gtk/minifram.h
-include/wx/gtk/notebook.h
-include/wx/gtk/pen.h
-include/wx/gtk/popupwin.h
-include/wx/gtk/radiobox.h
-include/wx/gtk/radiobut.h
-include/wx/gtk/region.h
-include/wx/gtk/scrolbar.h
-include/wx/gtk/scrolwin.h
-include/wx/gtk/slider.h
-include/wx/gtk/spinbutt.h
-include/wx/gtk/spinctrl.h
-include/wx/gtk/statbmp.h
-include/wx/gtk/statbox.h
-include/wx/gtk/statline.h
-include/wx/gtk/stattext.h
-include/wx/gtk/tbargtk.h
-include/wx/gtk/textctrl.h
-include/wx/gtk/tglbtn.h
-include/wx/gtk/timer.h
-include/wx/gtk/tooltip.h
-include/wx/gtk/toplevel.h
-include/wx/gtk/treectrl.h
-include/wx/gtk/wave.h
-include/wx/gtk/win_gtk.h
-include/wx/gtk/window.h
+include/wx-2.4/wx/accel.h
+include/wx-2.4/wx/app.h
+include/wx-2.4/wx/arrimpl.cpp
+include/wx-2.4/wx/artprov.h
+include/wx-2.4/wx/bitmap.h
+include/wx-2.4/wx/bmpbuttn.h
+include/wx-2.4/wx/brush.h
+include/wx-2.4/wx/buffer.h
+include/wx-2.4/wx/build.h
+include/wx-2.4/wx/busyinfo.h
+include/wx-2.4/wx/button.h
+include/wx-2.4/wx/calctrl.h
+include/wx-2.4/wx/caret.h
+include/wx-2.4/wx/checkbox.h
+include/wx-2.4/wx/checklst.h
+include/wx-2.4/wx/chkconf.h
+include/wx-2.4/wx/choicdlg.h
+include/wx-2.4/wx/choice.h
+include/wx-2.4/wx/clipbrd.h
+include/wx-2.4/wx/clntdata.h
+include/wx-2.4/wx/cmdline.h
+include/wx-2.4/wx/cmdproc.h
+include/wx-2.4/wx/cmndata.h
+include/wx-2.4/wx/colordlg.h
+include/wx-2.4/wx/colour.h
+include/wx-2.4/wx/combobox.h
+include/wx-2.4/wx/confbase.h
+include/wx-2.4/wx/config.h
+include/wx-2.4/wx/containr.h
+include/wx-2.4/wx/control.h
+include/wx-2.4/wx/cshelp.h
+include/wx-2.4/wx/ctrlsub.h
+include/wx-2.4/wx/cursor.h
+include/wx-2.4/wx/dataobj.h
+include/wx-2.4/wx/date.h
+include/wx-2.4/wx/datetime.h
+include/wx-2.4/wx/datetime.inl
+include/wx-2.4/wx/datstrm.h
+include/wx-2.4/wx/db.h
+include/wx-2.4/wx/dbgrid.h
+include/wx-2.4/wx/dbkeyg.h
+include/wx-2.4/wx/dbtable.h
+include/wx-2.4/wx/dc.h
+include/wx-2.4/wx/dcbuffer.h
+include/wx-2.4/wx/dcclient.h
+include/wx-2.4/wx/dcmemory.h
+include/wx-2.4/wx/dcprint.h
+include/wx-2.4/wx/dcps.h
+include/wx-2.4/wx/dcscreen.h
+include/wx-2.4/wx/dde.h
+include/wx-2.4/wx/debug.h
+include/wx-2.4/wx/defs.h
+include/wx-2.4/wx/dialog.h
+include/wx-2.4/wx/dialup.h
+include/wx-2.4/wx/dir.h
+include/wx-2.4/wx/dirctrl.h
+include/wx-2.4/wx/dirdlg.h
+include/wx-2.4/wx/dnd.h
+include/wx-2.4/wx/docmdi.h
+include/wx-2.4/wx/docview.h
+include/wx-2.4/wx/dragimag.h
+include/wx-2.4/wx/dynarray.h
+include/wx-2.4/wx/dynlib.h
+include/wx-2.4/wx/dynload.h
+include/wx-2.4/wx/effects.h
+include/wx-2.4/wx/encconv.h
+include/wx-2.4/wx/event.h
+include/wx-2.4/wx/expr.h
+include/wx-2.4/wx/fdrepdlg.h
+include/wx-2.4/wx/features.h
+include/wx-2.4/wx/ffile.h
+include/wx-2.4/wx/file.h
+include/wx-2.4/wx/fileconf.h
+include/wx-2.4/wx/filedlg.h
+include/wx-2.4/wx/filefn.h
+include/wx-2.4/wx/filename.h
+include/wx-2.4/wx/filesys.h
+include/wx-2.4/wx/font.h
+include/wx-2.4/wx/fontdlg.h
+include/wx-2.4/wx/fontenc.h
+include/wx-2.4/wx/fontenum.h
+include/wx-2.4/wx/fontmap.h
+include/wx-2.4/wx/fontutil.h
+include/wx-2.4/wx/frame.h
+include/wx-2.4/wx/fs_inet.h
+include/wx-2.4/wx/fs_mem.h
+include/wx-2.4/wx/fs_zip.h
+include/wx-2.4/wx/gauge.h
+include/wx-2.4/wx/gdicmn.h
+include/wx-2.4/wx/gdiobj.h
+include/wx-2.4/wx/generic/accel.h
+include/wx-2.4/wx/generic/calctrl.h
+include/wx-2.4/wx/generic/caret.h
+include/wx-2.4/wx/generic/choicdgg.h
+include/wx-2.4/wx/generic/colrdlgg.h
+include/wx-2.4/wx/generic/dcpsg.h
+include/wx-2.4/wx/generic/dirctrlg.h
+include/wx-2.4/wx/generic/dirdlgg.h
+include/wx-2.4/wx/generic/dragimgg.h
+include/wx-2.4/wx/generic/fdrepdlg.h
+include/wx-2.4/wx/generic/filedlgg.h
+include/wx-2.4/wx/generic/fontdlgg.h
+include/wx-2.4/wx/generic/grid.h
+include/wx-2.4/wx/generic/gridctrl.h
+include/wx-2.4/wx/generic/gridg.h
+include/wx-2.4/wx/generic/helpext.h
+include/wx-2.4/wx/generic/helphtml.h
+include/wx-2.4/wx/generic/imaglist.h
+include/wx-2.4/wx/generic/laywin.h
+include/wx-2.4/wx/generic/listctrl.h
+include/wx-2.4/wx/generic/msgdlgg.h
+include/wx-2.4/wx/generic/notebook.h
+include/wx-2.4/wx/generic/paletteg.h
+include/wx-2.4/wx/generic/panelg.h
+include/wx-2.4/wx/generic/printps.h
+include/wx-2.4/wx/generic/prntdlgg.h
+include/wx-2.4/wx/generic/progdlgg.h
+include/wx-2.4/wx/generic/sashwin.h
+include/wx-2.4/wx/generic/scrolwin.h
+include/wx-2.4/wx/generic/spinctlg.h
+include/wx-2.4/wx/generic/splash.h
+include/wx-2.4/wx/generic/splitter.h
+include/wx-2.4/wx/generic/statusbr.h
+include/wx-2.4/wx/generic/tabg.h
+include/wx-2.4/wx/generic/textdlgg.h
+include/wx-2.4/wx/generic/timer.h
+include/wx-2.4/wx/generic/treectlg.h
+include/wx-2.4/wx/generic/wizard.h
+include/wx-2.4/wx/geometry.h
+include/wx-2.4/wx/gifdecod.h
+include/wx-2.4/wx/glcanvas.h
+include/wx-2.4/wx/grid.h
+include/wx-2.4/wx/gsocket.h
+include/wx-2.4/wx/gtk/accel.h
+include/wx-2.4/wx/gtk/app.h
+include/wx-2.4/wx/gtk/bitmap.h
+include/wx-2.4/wx/gtk/bmpbuttn.h
+include/wx-2.4/wx/gtk/brush.h
+include/wx-2.4/wx/gtk/button.h
+include/wx-2.4/wx/gtk/checkbox.h
+include/wx-2.4/wx/gtk/checklst.h
+include/wx-2.4/wx/gtk/choice.h
+include/wx-2.4/wx/gtk/clipbrd.h
+include/wx-2.4/wx/gtk/colour.h
+include/wx-2.4/wx/gtk/combobox.h
+include/wx-2.4/wx/gtk/control.h
+include/wx-2.4/wx/gtk/cursor.h
+include/wx-2.4/wx/gtk/dataform.h
+include/wx-2.4/wx/gtk/dataobj.h
+include/wx-2.4/wx/gtk/dataobj2.h
+include/wx-2.4/wx/gtk/dc.h
+include/wx-2.4/wx/gtk/dcclient.h
+include/wx-2.4/wx/gtk/dcmemory.h
+include/wx-2.4/wx/gtk/dcscreen.h
+include/wx-2.4/wx/gtk/dialog.h
+include/wx-2.4/wx/gtk/dnd.h
+include/wx-2.4/wx/gtk/filedlg.h
+include/wx-2.4/wx/gtk/font.h
+include/wx-2.4/wx/gtk/fontdlg.h
+include/wx-2.4/wx/gtk/frame.h
+include/wx-2.4/wx/gtk/gauge.h
+include/wx-2.4/wx/gtk/gdiobj.h
+include/wx-2.4/wx/gtk/glcanvas.h
+include/wx-2.4/wx/gtk/icon.h
+include/wx-2.4/wx/gtk/joystick.h
+include/wx-2.4/wx/gtk/listbox.h
+include/wx-2.4/wx/gtk/mdi.h
+include/wx-2.4/wx/gtk/menu.h
+include/wx-2.4/wx/gtk/menuitem.h
+include/wx-2.4/wx/gtk/minifram.h
+include/wx-2.4/wx/gtk/notebook.h
+include/wx-2.4/wx/gtk/pen.h
+include/wx-2.4/wx/gtk/popupwin.h
+include/wx-2.4/wx/gtk/radiobox.h
+include/wx-2.4/wx/gtk/radiobut.h
+include/wx-2.4/wx/gtk/region.h
+include/wx-2.4/wx/gtk/scrolbar.h
+include/wx-2.4/wx/gtk/scrolwin.h
+include/wx-2.4/wx/gtk/slider.h
+include/wx-2.4/wx/gtk/spinbutt.h
+include/wx-2.4/wx/gtk/spinctrl.h
+include/wx-2.4/wx/gtk/statbmp.h
+include/wx-2.4/wx/gtk/statbox.h
+include/wx-2.4/wx/gtk/statline.h
+include/wx-2.4/wx/gtk/stattext.h
+include/wx-2.4/wx/gtk/tbargtk.h
+include/wx-2.4/wx/gtk/textctrl.h
+include/wx-2.4/wx/gtk/tglbtn.h
+include/wx-2.4/wx/gtk/timer.h
+include/wx-2.4/wx/gtk/tooltip.h
+include/wx-2.4/wx/gtk/toplevel.h
+include/wx-2.4/wx/gtk/treectrl.h
+include/wx-2.4/wx/gtk/wave.h
+include/wx-2.4/wx/gtk/win_gtk.h
+include/wx-2.4/wx/gtk/window.h
+include/wx-2.4/wx/hash.h
+include/wx-2.4/wx/hashmap.h
+include/wx-2.4/wx/help.h
+include/wx-2.4/wx/helpbase.h
+include/wx-2.4/wx/helphtml.h
+include/wx-2.4/wx/helpwin.h
+include/wx-2.4/wx/html/forcelnk.h
+include/wx-2.4/wx/html/helpctrl.h
+include/wx-2.4/wx/html/helpdata.h
+include/wx-2.4/wx/html/helpfrm.h
+include/wx-2.4/wx/html/htmlcell.h
+include/wx-2.4/wx/html/htmldefs.h
+include/wx-2.4/wx/html/htmlfilt.h
+include/wx-2.4/wx/html/htmlpars.h
+include/wx-2.4/wx/html/htmltag.h
+include/wx-2.4/wx/html/htmlwin.h
+include/wx-2.4/wx/html/htmprint.h
+include/wx-2.4/wx/html/m_templ.h
+include/wx-2.4/wx/html/winpars.h
+include/wx-2.4/wx/icon.h
+include/wx-2.4/wx/iconbndl.h
+include/wx-2.4/wx/imagbmp.h
+include/wx-2.4/wx/image.h
+include/wx-2.4/wx/imaggif.h
+include/wx-2.4/wx/imagiff.h
+include/wx-2.4/wx/imagjpeg.h
+include/wx-2.4/wx/imaglist.h
+include/wx-2.4/wx/imagpcx.h
+include/wx-2.4/wx/imagpng.h
+include/wx-2.4/wx/imagpnm.h
+include/wx-2.4/wx/imagtiff.h
+include/wx-2.4/wx/imagxpm.h
+include/wx-2.4/wx/intl.h
+include/wx-2.4/wx/ioswrap.h
+include/wx-2.4/wx/ipc.h
+include/wx-2.4/wx/ipcbase.h
+include/wx-2.4/wx/isql.h
+include/wx-2.4/wx/isqlext.h
+include/wx-2.4/wx/joystick.h
+include/wx-2.4/wx/layout.h
+include/wx-2.4/wx/laywin.h
+include/wx-2.4/wx/list.h
+include/wx-2.4/wx/listbase.h
+include/wx-2.4/wx/listbox.h
+include/wx-2.4/wx/listctrl.h
+include/wx-2.4/wx/listimpl.cpp
+include/wx-2.4/wx/log.h
+include/wx-2.4/wx/longlong.h
+include/wx-2.4/wx/matrix.h
+include/wx-2.4/wx/mdi.h
+include/wx-2.4/wx/memconf.h
+include/wx-2.4/wx/memory.h
+include/wx-2.4/wx/memtext.h
+include/wx-2.4/wx/menu.h
+include/wx-2.4/wx/menuitem.h
+include/wx-2.4/wx/metafile.h
+include/wx-2.4/wx/mimetype.h
+include/wx-2.4/wx/minifram.h
+include/wx-2.4/wx/module.h
+include/wx-2.4/wx/msgdlg.h
+include/wx-2.4/wx/msgout.h
+include/wx-2.4/wx/mstream.h
+include/wx-2.4/wx/notebook.h
+include/wx-2.4/wx/object.h
+include/wx-2.4/wx/odbc.h
+include/wx-2.4/wx/ownerdrw.h
+include/wx-2.4/wx/palette.h
+include/wx-2.4/wx/panel.h
+include/wx-2.4/wx/paper.h
+include/wx-2.4/wx/pen.h
+include/wx-2.4/wx/platform.h
+include/wx-2.4/wx/popupwin.h
+include/wx-2.4/wx/print.h
+include/wx-2.4/wx/printdlg.h
+include/wx-2.4/wx/prntbase.h
+include/wx-2.4/wx/process.h
+include/wx-2.4/wx/progdlg.h
+include/wx-2.4/wx/prop.h
+include/wx-2.4/wx/propform.h
+include/wx-2.4/wx/proplist.h
+include/wx-2.4/wx/protocol/file.h
+include/wx-2.4/wx/protocol/ftp.h
+include/wx-2.4/wx/protocol/http.h
+include/wx-2.4/wx/protocol/protocol.h
+include/wx-2.4/wx/quantize.h
+include/wx-2.4/wx/radiobox.h
+include/wx-2.4/wx/radiobut.h
+include/wx-2.4/wx/regex.h
+include/wx-2.4/wx/region.h
+include/wx-2.4/wx/resource.h
+include/wx-2.4/wx/sashwin.h
+include/wx-2.4/wx/sckaddr.h
+include/wx-2.4/wx/sckipc.h
+include/wx-2.4/wx/sckstrm.h
+include/wx-2.4/wx/scrolbar.h
+include/wx-2.4/wx/scrolwin.h
+include/wx-2.4/wx/settings.h
+include/wx-2.4/wx/sizer.h
+include/wx-2.4/wx/slider.h
+include/wx-2.4/wx/snglinst.h
+include/wx-2.4/wx/socket.h
+include/wx-2.4/wx/spinbutt.h
+include/wx-2.4/wx/spinctrl.h
+include/wx-2.4/wx/splash.h
+include/wx-2.4/wx/splitter.h
+include/wx-2.4/wx/stack.h
+include/wx-2.4/wx/statbmp.h
+include/wx-2.4/wx/statbox.h
+include/wx-2.4/wx/statline.h
+include/wx-2.4/wx/stattext.h
+include/wx-2.4/wx/statusbr.h
+include/wx-2.4/wx/strconv.h
+include/wx-2.4/wx/stream.h
+include/wx-2.4/wx/string.h
+include/wx-2.4/wx/sysopt.h
+include/wx-2.4/wx/tab.h
+include/wx-2.4/wx/tabctrl.h
+include/wx-2.4/wx/taskbar.h
+include/wx-2.4/wx/tbarbase.h
+include/wx-2.4/wx/tbarsmpl.h
+include/wx-2.4/wx/textbuf.h
+include/wx-2.4/wx/textctrl.h
+include/wx-2.4/wx/textdlg.h
+include/wx-2.4/wx/textfile.h
+include/wx-2.4/wx/tglbtn.h
+include/wx-2.4/wx/thread.h
+include/wx-2.4/wx/thrimpl.cpp
+include/wx-2.4/wx/time.h
+include/wx-2.4/wx/timer.h
+include/wx-2.4/wx/tipdlg.h
+include/wx-2.4/wx/tipwin.h
+include/wx-2.4/wx/tokenzr.h
+include/wx-2.4/wx/toolbar.h
+include/wx-2.4/wx/tooltip.h
+include/wx-2.4/wx/toplevel.h
+include/wx-2.4/wx/treebase.h
+include/wx-2.4/wx/treectrl.h
+include/wx-2.4/wx/txtstrm.h
+include/wx-2.4/wx/types.h
+include/wx-2.4/wx/unix/execute.h
+include/wx-2.4/wx/unix/fontutil.h
+include/wx-2.4/wx/unix/gsockunx.h
+include/wx-2.4/wx/unix/mimetype.h
+include/wx-2.4/wx/unix/utilsx11.h
+include/wx-2.4/wx/url.h
+include/wx-2.4/wx/utils.h
+include/wx-2.4/wx/valgen.h
+include/wx-2.4/wx/validate.h
+include/wx-2.4/wx/valtext.h
+include/wx-2.4/wx/variant.h
+include/wx-2.4/wx/vector.h
+include/wx-2.4/wx/version.h
+include/wx-2.4/wx/volume.h
+include/wx-2.4/wx/wave.h
+include/wx-2.4/wx/wfstream.h
+include/wx-2.4/wx/window.h
+include/wx-2.4/wx/wizard.h
+include/wx-2.4/wx/wx.h
+include/wx-2.4/wx/wx_cw.h
+include/wx-2.4/wx/wx_cw_cm.h
+include/wx-2.4/wx/wx_cw_d.h
+include/wx-2.4/wx/wxchar.h
+include/wx-2.4/wx/wxexpr.h
+include/wx-2.4/wx/wxhtml.h
+include/wx-2.4/wx/wxprec.h
+include/wx-2.4/wx/xpmdecod.h
+include/wx-2.4/wx/zipstrm.h
+include/wx-2.4/wx/zstream.h
 include/wx/gtk2-2.4/wx/setup.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/help.h
-include/wx/helpbase.h
-include/wx/helphtml.h
-include/wx/helpwin.h
-include/wx/html/forcelnk.h
-include/wx/html/helpctrl.h
-include/wx/html/helpdata.h
-include/wx/html/helpfrm.h
-include/wx/html/htmlcell.h
-include/wx/html/htmldefs.h
-include/wx/html/htmlfilt.h
-include/wx/html/htmlpars.h
-include/wx/html/htmltag.h
-include/wx/html/htmlwin.h
-include/wx/html/htmprint.h
-include/wx/html/m_templ.h
-include/wx/html/winpars.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/imagbmp.h
-include/wx/image.h
-include/wx/imaggif.h
-include/wx/imagiff.h
-include/wx/imagjpeg.h
-include/wx/imaglist.h
-include/wx/imagpcx.h
-include/wx/imagpng.h
-include/wx/imagpnm.h
-include/wx/imagtiff.h
-include/wx/imagxpm.h
-include/wx/intl.h
-include/wx/ioswrap.h
-include/wx/ipc.h
-include/wx/ipcbase.h
-include/wx/isql.h
-include/wx/isqlext.h
-include/wx/joystick.h
-include/wx/layout.h
-include/wx/laywin.h
-include/wx/list.h
-include/wx/listbase.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/matrix.h
-include/wx/mdi.h
-include/wx/memconf.h
-include/wx/memory.h
-include/wx/memtext.h
-include/wx/menu.h
-include/wx/menuitem.h
-include/wx/metafile.h
-include/wx/mimetype.h
-include/wx/minifram.h
-include/wx/module.h
-include/wx/msgdlg.h
-include/wx/msgout.h
-include/wx/mstream.h
-include/wx/notebook.h
-include/wx/object.h
-include/wx/odbc.h
-include/wx/ownerdrw.h
-include/wx/palette.h
-include/wx/panel.h
-include/wx/paper.h
-include/wx/pen.h
-include/wx/platform.h
-include/wx/popupwin.h
-include/wx/print.h
-include/wx/printdlg.h
-include/wx/prntbase.h
-include/wx/process.h
-include/wx/progdlg.h
-include/wx/prop.h
-include/wx/propform.h
-include/wx/proplist.h
-include/wx/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/resource.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/spinbutt.h
-include/wx/spinctrl.h
-include/wx/splash.h
-include/wx/splitter.h
-include/wx/stack.h
-include/wx/statbmp.h
-include/wx/statbox.h
-include/wx/statline.h
-include/wx/stattext.h
-include/wx/statusbr.h
-include/wx/strconv.h
-include/wx/stream.h
-include/wx/string.h
-include/wx/sysopt.h
-include/wx/tab.h
-include/wx/tabctrl.h
-include/wx/taskbar.h
-include/wx/tbarbase.h
-include/wx/tbarsmpl.h
-include/wx/textbuf.h
-include/wx/textctrl.h
-include/wx/textdlg.h
-include/wx/textfile.h
-include/wx/tglbtn.h
-include/wx/thread.h
-include/wx/thrimpl.cpp
-include/wx/time.h
-include/wx/timer.h
-include/wx/tipdlg.h
-include/wx/tipwin.h
-include/wx/tokenzr.h
-include/wx/toolbar.h
-include/wx/tooltip.h
-include/wx/toplevel.h
-include/wx/treebase.h
-include/wx/treectrl.h
-include/wx/txtstrm.h
-include/wx/types.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/mimetype.h
-include/wx/unix/utilsx11.h
-include/wx/url.h
-include/wx/utils.h
-include/wx/valgen.h
-include/wx/validate.h
-include/wx/valtext.h
-include/wx/variant.h
-include/wx/vector.h
-include/wx/version.h
-include/wx/volume.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wx_cw.h
-include/wx/wx_cw_cm.h
-include/wx/wx_cw_d.h
-include/wx/wxchar.h
-include/wx/wxexpr.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xpmdecod.h
-include/wx/zipstrm.h
-include/wx/zstream.h
 lib/libwx_gtk2-2.4.so
 lib/libwx_gtk2-2.4.so.0
 lib/libwx_gtk2_gl-2.4.so
@@ -413,11 +413,13 @@ share/wx/gs_afm/Zapf.afm
 @dirrm share/wx/gs_afm
 @dirrm share/wx/afm
 @dirrm share/wx
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
 @dirrm include/wx/gtk2-2.4/wx
 @dirrm include/wx/gtk2-2.4
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
+@dirrm include/wx-2.4/wx/unix
+@dirrm include/wx-2.4/wx/protocol
+@dirrm include/wx-2.4/wx/html
+@dirrm include/wx-2.4/wx/gtk
+@dirrm include/wx-2.4/wx/generic
+@dirrm include/wx-2.4/wx
+@dirrm include/wx-2.4
 @dirrm include/wx
-- 
cgit