Updated Win32 MS-VisualC Workspace to run FLTK "out of the box":

Donload the archive, unpack, start VisualC and press F5 to compile
and run the demo and all other test programs... .

browser: wouldn't find sample file
CubeView: calls fluid in custom build step, unintialised position
fast_slow: build calls fluid
forms: added plastic buttons (cute)
inactive: build calls fluid
keyboard: build calls fluid, added mousewheel
mandelbrot: build calls fluid
resize: build calls fluid
radio: build calls fluid
shiny: build calls fluid
tabs: build calls fluid
valuators: build calls fluid, tiny scrollbar bug
demo: debug on VC finds correct menu file


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1796 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

11 files changed, 348 insertions, 2 deletions

diff --git a/visualc/CubeView.dsp b/visualc/CubeView.dsp
index 297d43989..8da936605 100644
--- a/visualc/CubeView.dsp
+++ b/visualc/CubeView.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386

-# ADD LINK32 fltk.lib opengl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../CubeView/CubeView.exe" /libpath:"..\lib"

+# ADD LINK32 fltk.lib opengl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeView.exe" /libpath:"..\lib"

 # SUBTRACT LINK32 /pdb:none /incremental:yes

 

 !ELSEIF  "$(CFG)" == "CubeView - Win32 Debug"

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 fltkd.lib opengl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../CubeView/CubeViewd.exe" /pdbtype:sept /libpath:"..\lib"

+# ADD LINK32 fltkd.lib opengl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\lib"

 # SUBTRACT LINK32 /pdb:none /incremental:no

 

 !ENDIF 

@@ -101,5 +101,36 @@ SOURCE=..\test\CubeView.cxx
 

 SOURCE=..\test\CubeViewUI.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\CubeViewUI.fl

+

+!IF  "$(CFG)" == "CubeView - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\CubeViewUI.fl

+

+"..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c CubeViewUI.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "CubeView - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\CubeViewUI.fl

+

+"..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c CubeViewUI.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/fast_slow.dsp b/visualc/fast_slow.dsp
index b2b4df984..0d90bbed8 100644
--- a/visualc/fast_slow.dsp
+++ b/visualc/fast_slow.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\fast_slow.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\fast_slow.fl

+

+!IF  "$(CFG)" == "fast_slow - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\fast_slow.fl

+

+"..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c fast_slow.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "fast_slow - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\fast_slow.fl

+

+"..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c fast_slow.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/fltk.dsw b/visualc/fltk.dsw
index 2b22e3b07..a9245b6b7 100644
--- a/visualc/fltk.dsw
+++ b/visualc/fltk.dsw
@@ -17,6 +17,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltkgl

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -434,6 +437,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name tiled_image

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name help

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -476,6 +482,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fltk

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -719,6 +731,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -749,6 +764,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -791,6 +809,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -941,6 +962,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -956,6 +980,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1022,6 +1049,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltkgl

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1067,6 +1097,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -1112,6 +1145,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name fltk

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name fluid

+    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/visualc/inactive.dsp b/visualc/inactive.dsp
index d098d08a7..8d077b3d2 100755
--- a/visualc/inactive.dsp
+++ b/visualc/inactive.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\inactive.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\inactive.fl

+

+!IF  "$(CFG)" == "inactive - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\inactive.fl

+

+"..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c inactive.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "inactive - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\inactive.fl

+

+"..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c inactive.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/keyboard.dsp b/visualc/keyboard.dsp
index acd067905..07529402d 100644
--- a/visualc/keyboard.dsp
+++ b/visualc/keyboard.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\keyboard.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\keyboard_ui.fl

+

+!IF  "$(CFG)" == "keyboard - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\keyboard_ui.fl

+

+"..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c keyboard_ui.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "keyboard - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\keyboard_ui.fl

+

+"..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c keyboard_ui.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/mandelbrot.dsp b/visualc/mandelbrot.dsp
index 1eeca5599..89b27f631 100644
--- a/visualc/mandelbrot.dsp
+++ b/visualc/mandelbrot.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\mandelbrot.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\mandelbrot_ui.fl

+

+!IF  "$(CFG)" == "mandelbrot - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\mandelbrot_ui.fl

+

+"../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c mandelbrot_ui.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "mandelbrot - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\mandelbrot_ui.fl

+

+"../test/mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c mandelbrot_ui.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/radio.dsp b/visualc/radio.dsp
index a2668c9bd..081253ba9 100644
--- a/visualc/radio.dsp
+++ b/visualc/radio.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\radio.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\radio.fl

+

+!IF  "$(CFG)" == "radio - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\radio.fl

+

+"../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c radio.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "radio - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\radio.fl

+

+"../test/radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c radio.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/resize.dsp b/visualc/resize.dsp
index 75f6a1882..916147873 100644
--- a/visualc/resize.dsp
+++ b/visualc/resize.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\resize.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\resize.fl

+

+!IF  "$(CFG)" == "resize - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\resize.fl

+

+"../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c resize.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "resize - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\resize.fl

+

+"../test/resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c resize.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/shiny.dsp b/visualc/shiny.dsp
index 7308ca016..786362a08 100644
--- a/visualc/shiny.dsp
+++ b/visualc/shiny.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\shiny.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\shiny_panel.fl

+

+!IF  "$(CFG)" == "shiny - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\shiny_panel.fl

+

+"../test/shiny_panel.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c shiny_panel.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "shiny - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\shiny_panel.fl

+

+"../test/shiny_panel.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c shiny_panel.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/tabs.dsp b/visualc/tabs.dsp
index 826098344..adb8cb172 100644
--- a/visualc/tabs.dsp
+++ b/visualc/tabs.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\tabs.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\tabs.fl

+

+!IF  "$(CFG)" == "tabs - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\tabs.fl

+

+"../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c tabs.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "tabs - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\tabs.fl

+

+"../test/tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c tabs.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project

diff --git a/visualc/valuators.dsp b/visualc/valuators.dsp
index ea56785c7..41be66461 100644
--- a/visualc/valuators.dsp
+++ b/visualc/valuators.dsp
@@ -93,5 +93,36 @@ LINK32=link.exe
 

 SOURCE=..\test\valuators.cxx

 # End Source File

+# Begin Source File

+

+SOURCE=..\test\valuators.fl

+

+!IF  "$(CFG)" == "valuators - Win32 Release"

+

+# Begin Custom Build - Create .cxx and .h file with fluid

+InputPath=..\test\valuators.fl

+

+"../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluid -c valuators.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "valuators - Win32 Debug"

+

+# Begin Custom Build - Create .cxx and .h file with fluidd

+InputPath=..\test\valuators.fl

+

+"../test/valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	cd ..\test 

+	..\fluid\fluidd -c valuators.fl 

+	cd ..\visualc 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

 # End Target

 # End Project