changed menu creation for choice and combobox (unique ids), control changed back...

[wxWidgets.git] / src / wxBase.dsp

diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index d14993979f4e0ef738dd99046a262e239c20bc8a..a83a7e5fe9a4063a0fbfca8b963725c2fc9a52ef 100644 (file)
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -573,64 +573,64 @@ SOURCE=.\msw\gsockmsw.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\include\wx\msw\setup0.h
+SOURCE=..\include\wx\msw\setup.h
 !IF  "$(CFG)" == "wxBase - Win32 Release Unicode DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\basedllu\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\basedllud\wx\setup.h
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/baseu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\baseu\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/baseud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\baseud\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\basedll\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\basedlld\wx\setup.h
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\base\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy $(InputPath) ..\lib\based\wx\setup.h