corrected the paths for the OLE files

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

diff --git a/distrib/msw/tmake/vc6univ.t b/distrib/msw/tmake/vc6univ.t
index 3f5ddc253aa1b82e8cdcaf1669213ff7c8857888..44b3b0ed656b58564d17fdd872e0bb738751dd6f 100644 (file)
--- a/distrib/msw/tmake/vc6univ.t
+++ b/distrib/msw/tmake/vc6univ.t
@@ -25,7 +25,9 @@
        #! automatically low level
        next unless $wxMSW{$file} =~ /\b(L|B)\b/;
 
-       my $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS";
+       my $tag;
+       if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+       else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
        $project{$tag} .= $file . " "
     }
 
@@ -183,6 +185,11 @@ SOURCE=.\msw\dummy.cpp
 # End Source File
 #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
 #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+# Begin Group "OLE Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n");
+# End Group
 # End Group
 # Begin Group "Universal Files"
 

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 27a0ff76d811093cff1efdc24b9c7b29185e3bdb..a7195abe46661d7829aa2a120d67e5bc013ddfb1 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -892,10 +892,6 @@ SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\automtn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\bitmap.cpp
 # End Source File
 # Begin Source File
@@ -924,10 +920,6 @@ SOURCE=.\msw\data.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dataobj.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\dc.cpp
 # End Source File
 # Begin Source File
@@ -968,14 +960,6 @@ SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\droptgt.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
@@ -1040,10 +1024,6 @@ SOURCE=.\msw\minifram.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\oleutils.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\palette.cpp
 # End Source File
 # Begin Source File
@@ -1104,10 +1084,6 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\uuid.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
@@ -1130,6 +1106,35 @@ SOURCE=.\msw\gsockmsw.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 
+# Begin Group "OLE Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp
+# End Source File
+
+# End Group
 # End Group
 # Begin Group "Universal Files"
 
@@ -1778,6 +1783,10 @@ SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\iosfwrap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ioswrap.h
 # End Source File
 # Begin Source File