do NOT hard code univ sources in x11 port

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

diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
index 3ccb7a11a63e7735ad7a63c5ee72ff1680ff77f1..f4934126853b4ca05528a53221dd93daa0433dc6 100644 (file)
--- a/distrib/msw/tmake/x11.t
+++ b/distrib/msw/tmake/x11.t
@@ -22,17 +22,6 @@
         $project{"GUIOBJS"} .= $fileobj . " ";
     }
 
         $project{"GUIOBJS"} .= $fileobj . " ";
     }
 

-    foreach $file (sort keys %wxUNIV) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-
-        if ( $wxUNIV{$file} =~ /Theme/ ) {
-            $file = "themes/" . $file
-        }
-
-        $project{"X11_SOURCES"} .= "univ/" . $file . " ";
-        $project{"GUIOBJS"} .= $fileobj . " ";
-    }
-

     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotX11\b/;
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotX11\b/;
 


@@ -103,7 +92,7 @@ ALL_SOURCES = \
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 

-GUIOBJS = \
+GUI_LOWLEVEL_OBJS = \

                #$ ExpandList("GUIOBJS");
 
 COMMONOBJS = \
                #$ ExpandList("GUIOBJS");
 
 COMMONOBJS = \

diff --git a/src/x11/files.lst b/src/x11/files.lst
index c073bbfbc4d7eac24da1c2ad792098057bf795b9..f94664ef0e174091db21e684297df961975e112e 100644 (file)
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -31,41 +31,6 @@ ALL_SOURCES = \
                x11/toplevel.cpp \
                x11/utils.cpp \
                x11/window.cpp \
                x11/toplevel.cpp \
                x11/utils.cpp \
                x11/window.cpp \

-               univ/bmpbuttn.cpp \
-               univ/button.cpp \
-               univ/checkbox.cpp \
-               univ/checklst.cpp \
-               univ/choice.cpp \
-               univ/colschem.cpp \
-               univ/combobox.cpp \
-               univ/control.cpp \
-               univ/dialog.cpp \
-               univ/framuniv.cpp \
-               univ/gauge.cpp \
-               univ/themes/gtk.cpp \
-               univ/inpcons.cpp \
-               univ/inphand.cpp \
-               univ/listbox.cpp \
-               univ/menu.cpp \
-               univ/notebook.cpp \
-               univ/radiobox.cpp \
-               univ/radiobut.cpp \
-               univ/renderer.cpp \
-               univ/scrarrow.cpp \
-               univ/scrolbar.cpp \
-               univ/scrthumb.cpp \
-               univ/slider.cpp \
-               univ/spinbutt.cpp \
-               univ/statbmp.cpp \
-               univ/statbox.cpp \
-               univ/statline.cpp \
-               univ/stattext.cpp \
-               univ/statusbr.cpp \
-               univ/textctrl.cpp \
-               univ/theme.cpp \
-               univ/topluniv.cpp \
-               univ/themes/win32.cpp \
-               univ/winuniv.cpp \

                generic/accel.cpp \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
                generic/accel.cpp \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \


@@ -626,7 +591,7 @@ ALL_HEADERS = \
                protocol/http.h \
                protocol/protocol.h
 
                protocol/http.h \
                protocol/protocol.h
 

-GUIOBJS = \
+GUI_LOWLEVEL_OBJS = \

                app.o \
                bitmap.o \
                brush.o \
                app.o \
                bitmap.o \
                brush.o \


@@ -656,42 +621,7 @@ GUIOBJS = \
                timer.o \
                toplevel.o \
                utils.o \
                timer.o \
                toplevel.o \
                utils.o \

-               window.o \
-               bmpbuttn.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               colschem.o \
-               combobox.o \
-               control.o \
-               dialog.o \
-               framuniv.o \
-               gauge.o \
-               gtk.o \
-               inpcons.o \
-               inphand.o \
-               listbox.o \
-               menu.o \
-               notebook.o \
-               radiobox.o \
-               radiobut.o \
-               renderer.o \
-               scrarrow.o \
-               scrolbar.o \
-               scrthumb.o \
-               slider.o \
-               spinbutt.o \
-               statbmp.o \
-               statbox.o \
-               statline.o \
-               stattext.o \
-               statusbr.o \
-               textctrl.o \
-               theme.o \
-               topluniv.o \
-               win32.o \
-               winuniv.o
+               window.o

 
 COMMONOBJS = \
                parser.o \
 
 COMMONOBJS = \
                parser.o \