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 f69390496ab89abc8bb344d49fc6dea61d254153..2ae0a8fafddb91206ecc4435081622f76a6694dc 100755 (executable)
--- 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 fa1ee8a609a611c4bd081524e09ff871ebeb5dd7..d99adcecc323694e0623b37ea90354290ca08a51 100644 (file)
--- 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 bd478ea48257aa5b6d1373d35fdcfeeb42bd9178..884f0515055206c5db2fd3453b5b43d4e4e88ccb 100644 (file)
--- 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 d8cedb5f096ee4c6c6f4aacb8b027bf442c4f342..2597f65dd95e402ca0355847055f90f104d1f593 100644 (file)
--- 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 \