fixed wxUniv/GTK linking by getting rid of GENERICOBJS and putting them into GUIOBJS/GUI_LOWLEVEL_OBJS instead

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

configure.in

@@ -2232,7 +2232,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         ALL_OBJECTS="\$(GUIOBJS)"
     fi
 
-    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS)"
 
     if test "$TOOLKIT" != "MSW"; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"

distrib/msw/tmake/gtk.t

@@ -21,7 +21,17 @@
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
         $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
-        $project{"GENERICOBJS"} .= $fileobj . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+
+        #! also add it to the list of object files used by wxUniv if there
+        #! is no file with the same name among wxUniv own objects
+        my $filereal = $file;
+        if ( $file =~ /^([^.]+)g.cpp$/ ) {
+            $filereal = "$1.cpp";
+        }
+        if ( !exists $wxUNIV{$filereal} ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+        }
     }
 
     foreach $file (sort keys %wxCommon) {
@@ -96,9 +106,6 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-GENERICOBJS = \
-		#$ ExpandList("GENERICOBJS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 

src/gtk/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 17:19, 2001/11/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -735,7 +735,7 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-GENERICOBJS = \
+GUIOBJS = \
 		accel.o \
 		busyinfo.o \
 		calctrl.o \
@@ -782,9 +782,7 @@ GENERICOBJS = \
 		tipwin.o \
 		treectlg.o \
 		treelay.o \
-		wizard.o
+		wizard.o \
-
-GUIOBJS = \
 		app.o \
 		bitmap.o \
 		bmpbuttn.o \
@@ -849,6 +847,52 @@ GUIOBJS = \
 		window.o
 
 GUI_LOWLEVEL_OBJS = \
+		accel.o \
+		busyinfo.o \
+		calctrl.o \
+		caret.o \
+		choicdgg.o \
+		colrdlgg.o \
+		dcpsg.o \
+		dirctrlg.o \
+		dirdlgg.o \
+		dragimgg.o \
+		fdrepdlg.o \
+		filedlgg.o \
+		fontdlgg.o \
+		grid.o \
+		gridctrl.o \
+		gridsel.o \
+		helpext.o \
+		helphtml.o \
+		helpwxht.o \
+		imaglist.o \
+		laywin.o \
+		listctrl.o \
+		logg.o \
+		msgdlgg.o \
+		numdlgg.o \
+		paletteg.o \
+		panelg.o \
+		printps.o \
+		prntdlgg.o \
+		progdlgg.o \
+		prop.o \
+		propform.o \
+		proplist.o \
+		sashwin.o \
+		scrlwing.o \
+		spinctlg.o \
+		splash.o \
+		splitter.o \
+		tabg.o \
+		tbarsmpl.o \
+		textdlgg.o \
+		tipdlg.o \
+		tipwin.o \
+		treectlg.o \
+		treelay.o \
+		wizard.o \
 		app.o \
 		bitmap.o \
 		brush.o \

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 17:19, 2001/11/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -735,7 +735,7 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-GENERICOBJS = \
+GUIOBJS = \
 		accel.o \
 		busyinfo.o \
 		calctrl.o \
@@ -782,9 +782,7 @@ GENERICOBJS = \
 		tipwin.o \
 		treectlg.o \
 		treelay.o \
-		wizard.o
+		wizard.o \
-
-GUIOBJS = \
 		app.o \
 		bitmap.o \
 		bmpbuttn.o \
@@ -849,6 +847,52 @@ GUIOBJS = \
 		window.o
 
 GUI_LOWLEVEL_OBJS = \
+		accel.o \
+		busyinfo.o \
+		calctrl.o \
+		caret.o \
+		choicdgg.o \
+		colrdlgg.o \
+		dcpsg.o \
+		dirctrlg.o \
+		dirdlgg.o \
+		dragimgg.o \
+		fdrepdlg.o \
+		filedlgg.o \
+		fontdlgg.o \
+		grid.o \
+		gridctrl.o \
+		gridsel.o \
+		helpext.o \
+		helphtml.o \
+		helpwxht.o \
+		imaglist.o \
+		laywin.o \
+		listctrl.o \
+		logg.o \
+		msgdlgg.o \
+		numdlgg.o \
+		paletteg.o \
+		panelg.o \
+		printps.o \
+		prntdlgg.o \
+		progdlgg.o \
+		prop.o \
+		propform.o \
+		proplist.o \
+		sashwin.o \
+		scrlwing.o \
+		spinctlg.o \
+		splash.o \
+		splitter.o \
+		tabg.o \
+		tbarsmpl.o \
+		textdlgg.o \
+		tipdlg.o \
+		tipwin.o \
+		treectlg.o \
+		treelay.o \
+		wizard.o \
 		app.o \
 		bitmap.o \
 		brush.o \