From: Robert Roebling <robert@roebling.de>
Date: Sun, 10 Feb 2002 14:31:12 +0000 (+0000)
Subject:   wxX11 compiles and links now. I wonder why there is
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4d7289e6b077278a1ec050e20d2357cdbfe66897

  wxX11 compiles and links now. I wonder why there is
    no wxToolBar class in /src/univ, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/configure b/configure
index f69390496a..2ae0a8fafd 100755
--- a/configure
+++ b/configure
@@ -12183,7 +12183,7 @@ rm -f conftest*
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
-        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
diff --git a/configure.in b/configure.in
index fa1ee8a609..d99adcecc3 100644
--- a/configure.in
+++ b/configure.in
@@ -1882,7 +1882,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
-        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index bd478ea482..884f051505 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -625,7 +625,6 @@ palette.cpp	X11
 pen.cpp	X11
 region.cpp	X11
 settings.cpp	X11
-toolbar.cpp	X11
 toplevel.cpp	X11
 timer.cpp	X11
 utils.cpp	X11
diff --git a/src/x11/files.lst b/src/x11/files.lst
index d8cedb5f09..2597f65dd9 100644
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -26,7 +26,6 @@ ALL_SOURCES = \
 		x11/region.cpp \
 		x11/settings.cpp \
 		x11/timer.cpp \
-		x11/toolbar.cpp \
 		x11/toplevel.cpp \
 		x11/utils.cpp \
 		x11/window.cpp \
@@ -648,7 +647,6 @@ GUIOBJS = \
 		region.o \
 		settings.o \
 		timer.o \
-		toolbar.o \
 		toplevel.o \
 		utils.o \
 		window.o \