compilation fix after wxCStrData changes

[wxWidgets.git] / build / msw / wx_adv.dsp

diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 237d467f2d7a45af9bbf4f84047d1030326d28a6..c96d594e6bcd08a3257a7e42a3142736945be4e1 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -466,6 +466,10 @@ SOURCE=..\..\src\common\dummy.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\src\common\hyperlnkcmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\src\common\taskbarcmn.cpp
 # End Source File
 # End Group
 SOURCE=..\..\src\common\taskbarcmn.cpp
 # End Source File
 # End Group


@@ -660,7 +664,7 @@ SOURCE=..\..\src\generic\helpext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\hyperlink.cpp
+SOURCE=..\..\src\generic\hyperlinkg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -696,133 +700,133 @@ SOURCE=..\..\src\generic\wizard.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\setup.h
+SOURCE=..\..\include\wx\msw\setup.h

 
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 
 
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 


@@ -831,133 +835,133 @@ InputPath=..\..\include\wx\univ\setup.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\setup.h
+SOURCE=..\..\include\wx\univ\setup.h

 
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 
 
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 

-# Begin Custom Build - 
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 


@@ -1197,6 +1201,10 @@ SOURCE=..\..\include\wx\generic\helpext.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\generic\hyperlink.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\generic\laywin.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\generic\laywin.h
 # End Source File
 # Begin Source File