Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 61942eb0ff42836171fadda42e50d7cc0abae1bd..ba8f85ced522c053e9ed8cb49a965cb0d9f1ae18 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -30,136 +30,136 @@ PNGSETUP=
 
 !include $(WXDIR)\src\makemsc.env
 
 
 !include $(WXDIR)\src\makemsc.env
 

+MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL)
+

 #
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
 #
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:

+        cd $(WXDIR)\samples\artprov
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\calendar
         cd $(WXDIR)\samples\calendar

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\caret
         cd $(WXDIR)\samples\caret

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\checklst
         cd $(WXDIR)\samples\checklst

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\config
         cd $(WXDIR)\samples\config

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\controls
         cd $(WXDIR)\samples\controls

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\db
         cd $(WXDIR)\samples\db

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\ipc
         cd $(WXDIR)\samples\ipc

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\dialogs
         cd $(WXDIR)\samples\dialogs

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\dnd
         cd $(WXDIR)\samples\dnd

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\docview
         cd $(WXDIR)\samples\docview

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\docvwmdi
         cd $(WXDIR)\samples\docvwmdi

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\drawing
         cd $(WXDIR)\samples\drawing

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\dynamic
         cd $(WXDIR)\samples\dynamic

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\font
         cd $(WXDIR)\samples\font

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\grid
         cd $(WXDIR)\samples\grid

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\newgrid
         cd $(WXDIR)\samples\newgrid

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\help
         cd $(WXDIR)\samples\help

-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
         cd $(WXDIR)\samples\image
 !endif
         cd $(WXDIR)\samples\image

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\internat
         cd $(WXDIR)\samples\internat

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\joytest
         cd $(WXDIR)\samples\joytest

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\keyboard
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\layout
         cd $(WXDIR)\samples\layout

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\listctrl
         cd $(WXDIR)\samples\listctrl

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\mdi
         cd $(WXDIR)\samples\mdi

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\menu
         cd $(WXDIR)\samples\menu

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc
 !endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
         cd $(WXDIR)\samples\minifram
 !endif
         cd $(WXDIR)\samples\minifram

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\minimal
         cd $(WXDIR)\samples\minimal

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\nativdlg
         cd $(WXDIR)\samples\nativdlg

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\dialup
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\dialup

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
         cd $(WXDIR)\samples\notebook
 !endif
         cd $(WXDIR)\samples\notebook

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\oleauto
         cd $(WXDIR)\samples\oleauto

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\ownerdrw
         cd $(WXDIR)\samples\ownerdrw

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\png
         cd $(WXDIR)\samples\png

-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\plot
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\printing
         cd $(WXDIR)\samples\printing

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\proplist
         cd $(WXDIR)\samples\proplist

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\regtest
         cd $(WXDIR)\samples\regtest

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\resource
         cd $(WXDIR)\samples\resource

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
-        cd $(WXDIR)\samples\richedit
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\rotate
         cd $(WXDIR)\samples\rotate

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\sashtest
         cd $(WXDIR)\samples\sashtest

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\scroll
         cd $(WXDIR)\samples\scroll

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\scrollsub
         cd $(WXDIR)\samples\scrollsub

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\splitter
         cd $(WXDIR)\samples\splitter

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
         cd $(WXDIR)\samples\taskbar
 !endif
         cd $(WXDIR)\samples\taskbar

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\text
         cd $(WXDIR)\samples\text

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\thread
         cd $(WXDIR)\samples\thread

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\toolbar
         cd $(WXDIR)\samples\toolbar

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\treectrl
         cd $(WXDIR)\samples\treectrl

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\typetest
         cd $(WXDIR)\samples\typetest

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\validate
         cd $(WXDIR)\samples\validate

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\wizard
         cd $(WXDIR)\samples\wizard

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\widgets
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\sockets
         cd $(WXDIR)\samples\sockets

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 
 clean:
         cd $(WXDIR)\samples\calendar
 
 clean:
         cd $(WXDIR)\samples\calendar


@@ -204,16 +204,16 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\joytest
         nmake -f makefile.vc clean
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\joytest
         nmake -f makefile.vc clean

+        cd $(WXDIR)\samples\keyboard
+        nmake -f makefile.vc clean

         cd $(WXDIR)\samples\layout
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\listctrl
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\mdi
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\layout
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\listctrl
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\mdi
         nmake -f makefile.vc clean

-!if "$(FINAL)" == "0"

         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc clean

-!endif

         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\menu
         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\menu


@@ -234,8 +234,6 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\png
         nmake -f makefile.vc clean
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\png
         nmake -f makefile.vc clean

-        cd $(WXDIR)\samples\plot
-        nmake -f makefile.vc clean

         cd $(WXDIR)\samples\printing
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\proplist
         cd $(WXDIR)\samples\printing
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\proplist


@@ -244,8 +242,6 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\resource
         nmake -f makefile.vc clean
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\resource
         nmake -f makefile.vc clean

-        cd $(WXDIR)\samples\richedit
-        nmake -f makefile.vc clean

         cd $(WXDIR)\samples\rotate
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\sashtest
         cd $(WXDIR)\samples\rotate
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\sashtest


@@ -272,10 +268,10 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc clean
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc clean

-!if "$(NOMAKE)"==""

         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc clean

-!endif
+        cd $(WXDIR)\samples\widgets
+        nmake -f makefile.vc clean

         cd $(WXDIR)\samples\sockets
         nmake -f makefile.vc clean
 
         cd $(WXDIR)\samples\sockets
         nmake -f makefile.vc clean