From 1e7fd311087384fb80f17a124d673aeb6a8fa9b8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 22 Jul 1999 20:20:42 +0000 Subject: [PATCH] New drawing test code. Added distrib file for wxMSW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/copy_src.bat | 643 ++++++++++++++++++++++++++++++++++++ samples/drawing/drawing.cpp | 185 +++-------- src/msw/pen.cpp | 3 +- 3 files changed, 700 insertions(+), 131 deletions(-) create mode 100755 distrib/msw/copy_src.bat diff --git a/distrib/msw/copy_src.bat b/distrib/msw/copy_src.bat new file mode 100755 index 0000000000..7ef2fc7f0d --- /dev/null +++ b/distrib/msw/copy_src.bat @@ -0,0 +1,643 @@ +echo -------- +echo This script will copy the wxMSW release files into ~/wxmsw_dist +echo -------- +echo + +md \wxmsw_dist +md \wxmsw_dist\wxMSW + +echo Base dir.. + +cd ..\.. + +echo Lib.. + +cd lib +md \wxmsw_dist\wxMSW\lib +copy dummy \wxmsw_dist\wxMSW\lib +cd .. + +echo Locale.. + +cd locale +md \wxmsw_dist\wxMSW\locale +copy *.?? \wxmsw_dist\wxMSW\locale +cd .. + +echo Docs.. + +cd docs\wine +copy COPYING.LIB \wxmsw_dist\wxMSW +copy licence.txt \wxmsw_dist\wxMSW\LICENCE.txt +cd ..\msw +copy install.txt \wxmsw_dist\wxMSW\INSTALL.txt +copy readme.txt \wxmsw_dist\wxMSW\README.txt +copy todo.txt \wxmsw_dist\wxMSW\TODO.txt +cd .. +copy symbols.txt \wxmsw_dist\wxMSW\SYMBOLS.txt +cd .. +echo Include dir.. + +md \wxmsw_dist\wxMSW\include +cd include +copy wx_*.* \wxmsw_dist\wxMSW\include + +md \wxmsw_dist\wxMSW\include\wx +cd wx +copy *.h \wxmsw_dist\wxMSW\include\wx +copy *.cpp \wxmsw_dist\wxMSW\include\wx + +md \wxmsw_dist\wxMSW\include\wx\generic +cd generic +copy *.h \wxmsw_dist\wxMSW\include\wx\generic +cd .. + +md \wxmsw_dist\wxMSW\include\wx\html +cd html +copy *.h \wxmsw_dist\wxMSW\include\wx\html +md \wxmsw_dist\wxMSW\include\wx\html\msw +cd msw +copy *.* \wxmsw_dist\wxMSW\include\wx\html\msw +cd ..\.. + + +md \wxmsw_dist\wxMSW\include\wx\msw +cd msw +copy *.* \wxmsw_dist\wxMSW\include\wx\msw +rem del \wxmsw_dist\wxMSW\include\wx\msw\setup.h +del \wxmsw_dist\wxMSW\include\wx\msw\Makefile.am +del \wxmsw_dist\wxMSW\include\wx\msw\Makefile.in +md \wxmsw_dist\wxMSW\include\wx\msw\gnuwin32 +cd gnuwin32 +copy *.h \wxmsw_dist\wxMSW\include\wx\msw\gnuwin32 +cd .. +md \wxmsw_dist\wxMSW\include\wx\msw\ole +cd ole +copy *.h \wxmsw_dist\wxMSW\include\wx\msw\ole +cd .. +cd ctl3d +copy *.h \wxmsw_dist\wxMSW\include\wx\msw\ctl3d +cd .. +cd .. + +md \wxmsw_dist\wxMSW\include\wx\protocol +cd protocol +copy *.h \wxmsw_dist\wxMSW\include\wx\protocol +cd .. + +cd ..\.. + +echo Src dir.. + +cd src +md \wxmsw_dist\wxMSW\src +copy *.* \wxmsw_dist\wxMSW\src +del Makefile.am \wxmsw_dist\wxMSW\src\Makefile.am +del Makefile.in \wxmsw_dist\wxMSW\src\Makefile.in + +cd msw +md \wxmsw_dist\wxMSW\src\msw +copy *.cpp \wxmsw_dist\wxMSW\src\msw +copy *.c \wxmsw_dist\wxMSW\src\msw +copy *.def \wxmsw_dist\wxMSW\src\msw +copy makefile.* \wxmsw_dist\wxMSW\src\msw +del Makefile.am \wxmsw_dist\wxMSW\src\msw\Makefile.am +del Makefile.in \wxmsw_dist\wxMSW\src\msw\Makefile.in +cd .. + +cd common +md \wxmsw_dist\wxMSW\src\common +copy glob.inc \wxmsw_dist\wxMSW\src\common +copy lexer.l \wxmsw_dist\wxMSW\src\common +copy parser.y \wxmsw_dist\wxMSW\src\common +copy *.c \wxmsw_dist\wxMSW\src\common +copy *.h \wxmsw_dist\wxMSW\src\common +copy *.cpp \wxmsw_dist\wxMSW\src\common +cd .. + +cd html +md \wxgtk_dist\wxGTK\src\html +copy *.cpp \wxgtk_dist\wxGTK\src\html +copy *.h \wxgtk_dist\wxGTK\src\html +cd bitmaps +md \wxgtk_dist\wxGTK\src\html\bitmaps +copy *.xpm \wxgtk_dist\wxGTK\src\html\bitmaps +cd ..\.. + +cd generic +md \wxmsw_dist\wxMSW\src\generic +copy *.cpp \wxmsw_dist\wxMSW\src\generic +cd .. + +cd zlib +md \wxmsw_dist\wxMSW\src\zlib +copy *.* \wxmsw_dist\wxMSW\src\zlib +cd .. + +cd png +md \wxmsw_dist\wxMSW\src\png +copy *.* \wxmsw_dist\wxMSW\src\png +cd .. + +cd jpeg +md \wxmsw_dist\wxMSW\src\jpeg +copy *.* \wxmsw_dist\wxMSW\src\jpeg +cd .. + +cd .. + +echo Samples dir.. + +cd samples +md \wxmsw_dist\wxMSW\samples +copy makefile.* \wxmsw_dist\wxMSW\samples + +echo Minimal sample.. + +cd minimal +md \wxmsw_dist\wxMSW\samples\minimal +copy Makefile.* \wxmsw_dist\wxMSW\samples\minimal +copy *.def \wxmsw_dist\wxMSW\samples\minimal +copy *.rc \wxmsw_dist\wxMSW\samples\minimal +copy minimal.cpp \wxmsw_dist\wxMSW\samples\minimal +copy mondrian.ico \wxmsw_dist\wxMSW\samples\minimal +cd .. + + +echo Bombs sample.. + +cd bombs +md \wxmsw_dist\wxMSW\samples\bombs +copy Makefile.* \wxmsw_dist\wxMSW\samples\bombs +copy *.cpp \wxmsw_dist\wxMSW\samples\bombs +copy *.h \wxmsw_dist\wxMSW\samples\bombs +copy *.ico \wxmsw_dist\wxMSW\samples\bombs +copy *.def \wxmsw_dist\wxMSW\samples\bombs +copy *.rc \wxmsw_dist\wxMSW\samples\bombs +cd .. + +echo Caret sample.. + +cd caret +md \wxmsw_dist\wxMSW\samples\caret +copy Makefile.* \wxmsw_dist\wxMSW\samples\caret +copy *.cpp \wxmsw_dist\wxMSW\samples\caret +copy *.h \wxmsw_dist\wxMSW\samples\caret +copy *.ico \wxmsw_dist\wxMSW\samples\caret +copy *.def \wxmsw_dist\wxMSW\samples\caret +copy *.rc \wxmsw_dist\wxMSW\samples\caret +cd .. + +echo Checklst sample.. + +cd checklst +md \wxmsw_dist\wxMSW\samples\checklst +copy Makefile.* \wxmsw_dist\wxMSW\samples\checklst +copy *.h \wxmsw_dist\wxMSW\samples\checklst +copy *.cpp \wxmsw_dist\wxMSW\samples\checklst +copy *.ico \wxmsw_dist\wxMSW\samples\checklst +copy *.def \wxmsw_dist\wxMSW\samples\checklst +copy *.rc \wxmsw_dist\wxMSW\samples\checklst +cd .. + +echo Config sample.. + +cd config +md \wxmsw_dist\wxMSW\samples\config +copy Makefile.* \wxmsw_dist\wxMSW\samples\config +copy *.h \wxmsw_dist\wxMSW\samples\config +copy *.cpp \wxmsw_dist\wxMSW\samples\config +copy *.ico \wxmsw_dist\wxMSW\samples\config +copy *.def \wxmsw_dist\wxMSW\samples\config +copy *.rc \wxmsw_dist\wxMSW\samples\config +cd .. + +echo Controls sample.. + +cd controls +md \wxmsw_dist\wxMSW\samples\controls +copy Makefile.* \wxmsw_dist\wxMSW\samples\controls +copy *.cpp \wxmsw_dist\wxMSW\samples\controls +copy *.h \wxmsw_dist\wxMSW\samples\controls +copy *.rc \wxmsw_dist\wxMSW\samples\controls +copy *.def \wxmsw_dist\wxMSW\samples\controls +copy *.ico \wxmsw_dist\wxMSW\samples\controls +cd icons +md \wxmsw_dist\wxMSW\samples\controls\icons +copy *.* \wxmsw_dist\wxMSW\samples\controls\icons +cd ..\.. + +echo Dialogs sample.. + +cd dialogs +md \wxmsw_dist\wxMSW\samples\dialogs +copy Makefile.* \wxmsw_dist\wxMSW\samples\dialogs +copy *.cpp \wxmsw_dist\wxMSW\samples\dialogs +copy *.h \wxmsw_dist\wxMSW\samples\dialogs +copy *.def \wxmsw_dist\wxMSW\samples\dialogs +copy *.rc \wxmsw_dist\wxMSW\samples\dialogs +copy *.ico \wxmsw_dist\wxMSW\samples\dialogs +cd .. + +echo DnD sample.. + +cd dnd +md \wxmsw_dist\wxMSW\samples\dnd +copy Makefile.* \wxmsw_dist\wxMSW\samples\dnd +copy *.cpp \wxmsw_dist\wxMSW\samples\dnd +copy *.h \wxmsw_dist\wxMSW\samples\dnd +copy *.def \wxmsw_dist\wxMSW\samples\dnd +copy *.rc \wxmsw_dist\wxMSW\samples\dnd +copy *.ico \wxmsw_dist\wxMSW\samples\dnd +cd .. + +echo Docview sample.. + +cd docview +md \wxmsw_dist\wxMSW\samples\docview +copy Makefile.* \wxmsw_dist\wxMSW\samples\docview +copy *.cpp \wxmsw_dist\wxMSW\samples\docview +copy *.h \wxmsw_dist\wxMSW\samples\docview +copy *.def \wxmsw_dist\wxMSW\samples\docview +copy *.rc \wxmsw_dist\wxMSW\samples\docview +copy *.ico \wxmsw_dist\wxMSW\samples\docview +cd .. + +echo DocvwMDI sample.. + +cd docvwmdi +md \wxmsw_dist\wxMSW\samples\docvwmdi +copy Makefile.* \wxmsw_dist\wxMSW\samples\docvwmdi +copy *.cpp \wxmsw_dist\wxMSW\samples\docvwmdi +copy *.h \wxmsw_dist\wxMSW\samples\docvwmdi +copy *.def \wxmsw_dist\wxMSW\samples\docvwmdi +copy *.rc \wxmsw_dist\wxMSW\samples\docvwmdi +copy *.ico \wxmsw_dist\wxMSW\samples\docvwmdi +cd .. + +echo Dynamic sample.. + +cd dynamic +md \wxmsw_dist\wxMSW\samples\dynamic +copy Makefile.* \wxmsw_dist\wxMSW\samples\dynamic +copy *.cpp \wxmsw_dist\wxMSW\samples\dynamic +copy *.h \wxmsw_dist\wxMSW\samples\dynamic +copy *.def \wxmsw_dist\wxMSW\samples\dynamic +copy *.rc \wxmsw_dist\wxMSW\samples\dynamic +copy *.ico \wxmsw_dist\wxMSW\samples\dynamic +cd .. + +echo Drawing sample.. + +cd drawing +md \wxmsw_dist\wxMSW\samples\drawing +copy Makefile.* \wxmsw_dist\wxMSW\samples\drawing +copy *.cpp \wxmsw_dist\wxMSW\samples\drawing +copy *.ico \wxmsw_dist\wxMSW\samples\drawing +copy *.h \wxmsw_dist\wxMSW\samples\drawing +copy *.rc \wxmsw_dist\wxMSW\samples\drawing +copy *.def \wxmsw_dist\wxMSW\samples\drawing +cd .. + +echo Forty sample.. + +cd forty +md \wxmsw_dist\wxMSW\samples\forty +copy Makefile.* \wxmsw_dist\wxMSW\samples\forty +copy *.cpp \wxmsw_dist\wxMSW\samples\forty +copy *.h \wxmsw_dist\wxMSW\samples\forty +copy *.def \wxmsw_dist\wxMSW\samples\forty +copy *.rc \wxmsw_dist\wxMSW\samples\forty +copy *.ico \wxmsw_dist\wxMSW\samples\forty +copy *.bmp \wxmsw_dist\wxMSW\samples\forty +copy *.xpm \wxmsw_dist\wxMSW\samples\forty +copy *.xbm \wxmsw_dist\wxMSW\samples\forty +cd .. + +echo Fractal sample.. + +cd fractal +md \wxmsw_dist\wxMSW\samples\fractal +copy Makefile.* \wxmsw_dist\wxMSW\samples\fractal +copy *.cpp \wxmsw_dist\wxMSW\samples\fractal +copy *.h \wxmsw_dist\wxMSW\samples\fractal +copy *.def \wxmsw_dist\wxMSW\samples\fractal +copy *.rc \wxmsw_dist\wxMSW\samples\fractal +copy *.ico \wxmsw_dist\wxMSW\samples\fractal +cd .. + +echo Grid sample.. + +cd grid +md \wxmsw_dist\wxMSW\samples\grid +copy Makefile.* \wxmsw_dist\wxMSW\samples\grid +copy *.cpp \wxmsw_dist\wxMSW\samples\grid +copy *.h \wxmsw_dist\wxMSW\samples\grid +copy *.def \wxmsw_dist\wxMSW\samples\grid +copy *.rc \wxmsw_dist\wxMSW\samples\grid +copy *.ico \wxmsw_dist\wxMSW\samples\grid +cd .. + +echo Help sample.. + +cd help +md \wxmsw_dist\wxMSW\samples\help +copy Makefile.* \wxmsw_dist\wxMSW\samples\help +copy *.cpp \wxmsw_dist\wxMSW\samples\help +copy *.def \wxmsw_dist\wxMSW\samples\help +copy *.rc \wxmsw_dist\wxMSW\samples\help +copy *.ico \wxmsw_dist\wxMSW\samples\help +copy *.xpm \wxmsw_dist\wxMSW\samples\help +cd doc +md \wxmsw_dist\wxMSW\samples\help\doc +copy *.* \wxmsw_dist\wxMSW\samples\help\doc +cd ..\.. + +echo Image sample.. + +cd image +md \wxmsw_dist\wxMSW\samples\image +copy Makefile.* \wxmsw_dist\wxMSW\samples\image +copy *.cpp \wxmsw_dist\wxMSW\samples\image +copy *.def \wxmsw_dist\wxMSW\samples\image +copy *.rc \wxmsw_dist\wxMSW\samples\image +copy *.ico \wxmsw_dist\wxMSW\samples\image +copy horse.png \wxmsw_dist\wxMSW\samples\image +copy horse.gif \wxmsw_dist\wxMSW\samples\image +copy horse.jpg \wxmsw_dist\wxMSW\samples\image +cd .. + +echo Internat sample.. + +cd internat +md \wxmsw_dist\wxMSW\samples\internat +copy Makefile.* \wxmsw_dist\wxMSW\samples\internat +copy *.cpp \wxmsw_dist\wxMSW\samples\internat +copy *.def \wxmsw_dist\wxMSW\samples\internat +copy *.rc \wxmsw_dist\wxMSW\samples\internat +copy *.ico \wxmsw_dist\wxMSW\samples\internat +copy readme.txt \wxmsw_dist\wxMSW\samples\internat +copy wxstd.po \wxmsw_dist\wxMSW\samples\internat +cd fr +md \wxmsw_dist\wxMSW\samples\internat\fr +copy *.?o \wxmsw_dist\wxMSW\samples\internat\fr +cd ..\.. + +echo Layout sample.. + +cd layout +md \wxmsw_dist\wxMSW\samples\layout +copy Makefile.* \wxmsw_dist\wxMSW\samples\layout +copy *.cpp \wxmsw_dist\wxMSW\samples\layout +copy *.ico \wxmsw_dist\wxMSW\samples\layout +copy *.def \wxmsw_dist\wxMSW\samples\layout +copy *.rc \wxmsw_dist\wxMSW\samples\layout +copy *.h \wxmsw_dist\wxMSW\samples\layout +cd .. + +echo Listctrl sample.. + +cd listctrl +md \wxmsw_dist\wxMSW\samples\listctrl +copy Makefile.* \wxmsw_dist\wxMSW\samples\listctrl +copy *.cpp \wxmsw_dist\wxMSW\samples\listctrl +copy *.h \wxmsw_dist\wxMSW\samples\listctrl +copy *.def \wxmsw_dist\wxMSW\samples\listctrl +copy *.rc \wxmsw_dist\wxMSW\samples\listctrl +copy *.ico \wxmsw_dist\wxMSW\samples\listctrl +cd bitmaps +md \wxmsw_dist\wxMSW\samples\listctrl\bitmaps +copy *.* \wxmsw_dist\wxMSW\samples\listctrl\bitmaps +cd ..\.. + +echo MDI sample.. + +cd mdi +md \wxmsw_dist\wxMSW\samples\mdi +copy Makefile.* \wxmsw_dist\wxMSW\samples\mdi +copy *.cpp \wxmsw_dist\wxMSW\samples\mdi +copy *.rc \wxmsw_dist\wxMSW\samples\mdi +copy *.def \wxmsw_dist\wxMSW\samples\mdi +copy *.h \wxmsw_dist\wxMSW\samples\mdi +copy *.ico \wxmsw_dist\wxMSW\samples\mdi +cd bitmaps +md \wxmsw_dist\wxMSW\samples\mdi\bitmaps +copy *.* \wxmsw_dist\wxMSW\samples\mdi\bitmaps +cd ..\.. + +echo Memcheck sample.. + +cd memcheck +md \wxmsw_dist\wxMSW\samples\memcheck +copy Makefile.* \wxmsw_dist\wxMSW\samples\memcheck +copy *.cpp \wxmsw_dist\wxMSW\samples\memcheck +copy *.ico \wxmsw_dist\wxMSW\samples\memcheck +copy *.rc \wxmsw_dist\wxMSW\samples\memcheck +copy *.def \wxmsw_dist\wxMSW\samples\memcheck +copy *.xpm \wxmsw_dist\wxMSW\samples\memcheck +cd .. + +echo Minifram sample.. + +cd minifram +md \wxmsw_dist\wxMSW\samples\minifram +copy Makefile.am \wxmsw_dist\wxMSW\samples\minifram +copy Makefile.in \wxmsw_dist\wxMSW\samples\minifram +copy *.cpp \wxmsw_dist\wxMSW\samples\minifram +copy *.xpm \wxmsw_dist\wxMSW\samples\minifram +copy *.ico \wxmsw_dist\wxMSW\samples\minifram +copy *.def \wxmsw_dist\wxMSW\samples\minifram +copy *.rc \wxmsw_dist\wxMSW\samples\minifram +cd bitmaps +md \wxmsw_dist\wxMSW\samples\minifram\bitmaps +copy *.* \wxmsw_dist\wxMSW\samples\minifram\bitmaps +cd ..\.. + +echo Notebook sample.. + +cd notebook +md \wxmsw_dist\wxMSW\samples\notebook +copy Makefile.* \wxmsw_dist\wxMSW\samples\notebook +copy *.cpp \wxmsw_dist\wxMSW\samples\notebook +copy *.ico \wxmsw_dist\wxMSW\samples\notebook +copy *.def \wxmsw_dist\wxMSW\samples\notebook +copy *.rc \wxmsw_dist\wxMSW\samples\notebook +copy *.h \wxmsw_dist\wxMSW\samples\notebook +cd .. + +echo Printing sample.. + +cd printing +md \wxmsw_dist\wxMSW\samples\printing +copy Makefile.* \wxmsw_dist\wxMSW\samples\printing +copy *.cpp \wxmsw_dist\wxMSW\samples\printing +copy *.h \wxmsw_dist\wxMSW\samples\printing +copy *.rc \wxmsw_dist\wxMSW\samples\printing +copy *.ico \wxmsw_dist\wxMSW\samples\printing +copy *.def \wxmsw_dist\wxMSW\samples\printing +copy *.xpm \wxmsw_dist\wxMSW\samples\printing +cd .. + +echo Proplist sample.. + +cd proplist +md \wxmsw_dist\wxMSW\samples\proplist +copy Makefile.* \wxmsw_dist\wxMSW\samples\proplist +copy *.rc \wxmsw_dist\wxMSW\samples\printing +copy *.def \wxmsw_dist\wxMSW\samples\printing +copy *.cpp \wxmsw_dist\wxMSW\samples\proplist +copy *.ico \wxmsw_dist\wxMSW\samples\printing +copy *.h \wxmsw_dist\wxMSW\samples\proplist +cd .. + +echo Resource sample.. + +cd resource +md \wxmsw_dist\wxMSW\samples\resource +copy Makefile.* \wxmsw_dist\wxMSW\samples\resource +copy *.ico \wxmsw_dist\wxMSW\samples\resource +copy *.rc \wxmsw_dist\wxMSW\samples\resource +copy *.def \wxmsw_dist\wxMSW\samples\resource +copy *.cpp \wxmsw_dist\wxMSW\samples\resource +copy *.h \wxmsw_dist\wxMSW\samples\resource +copy *.wxr \wxmsw_dist\wxMSW\samples\resource +cd .. + +echo Sashtest sample.. + +cd sashtest +md \wxmsw_dist\wxMSW\samples\sashtest +copy Makefile.* \wxmsw_dist\wxMSW\samples\sashtest +copy *.cpp \wxmsw_dist\wxMSW\samples\sashtest +copy *.rc \wxmsw_dist\wxMSW\samples\sashtest +copy *.h \wxmsw_dist\wxMSW\samples\sashtest +copy *.def \wxmsw_dist\wxMSW\samples\sashtest +copy *.ico \wxmsw_dist\wxMSW\samples\sashtest +cd .. + +echo Scroll sample.. + +cd sashtest +md \wxmsw_dist\wxMSW\samples\scroll +copy Makefile.* \wxmsw_dist\wxMSW\samples\scroll +copy *.cpp \wxmsw_dist\wxMSW\samples\scroll +copy *.def \wxmsw_dist\wxMSW\samples\scroll +copy *.rc \wxmsw_dist\wxMSW\samples\scroll +copy *.ico \wxmsw_dist\wxMSW\samples\scroll +copy *.h \wxmsw_dist\wxMSW\samples\scroll +cd .. + +echo Splitter sample.. + +cd splitter +md \wxmsw_dist\wxMSW\samples\splitter +copy Makefile.* \wxmsw_dist\wxMSW\samples\splitter +copy *.cpp \wxmsw_dist\wxMSW\samples\splitter +copy *.def \wxmsw_dist\wxMSW\samples\splitter +copy *.rc \wxmsw_dist\wxMSW\samples\splitter +copy *.ico \wxmsw_dist\wxMSW\samples\splitter +cd .. + +echo Text sample.. + +cd text +md \wxmsw_dist\wxMSW\samples\text +copy Makefile.* \wxmsw_dist\wxMSW\samples\text +copy *.cpp \wxmsw_dist\wxMSW\samples\text +copy *.def \wxmsw_dist\wxMSW\samples\text +copy *.rc \wxmsw_dist\wxMSW\samples\text +copy *.ico \wxmsw_dist\wxMSW\samples\text +cd .. + +echo Thread sample.. + +cd thread +md \wxmsw_dist\wxMSW\samples\thread +copy Makefile.* \wxmsw_dist\wxMSW\samples\thread +copy *.cpp \wxmsw_dist\wxMSW\samples\thread +copy *.def \wxmsw_dist\wxMSW\samples\thread +copy *.rc \wxmsw_dist\wxMSW\samples\thread +copy *.ico \wxmsw_dist\wxMSW\samples\thread +cd .. + +echo Toolbar sample.. + +cd toolbar +md \wxmsw_dist\wxMSW\samples\toolbar +copy Makefile.am \wxmsw_dist\wxMSW\samples\toolbar +copy Makefile.in \wxmsw_dist\wxMSW\samples\toolbar +copy *.cpp \wxmsw_dist\wxMSW\samples\toolbar +copy *.h \wxmsw_dist\wxMSW\samples\toolbar +copy *.rc \wxmsw_dist\wxMSW\samples\toolbar +copy *.def \wxmsw_dist\wxMSW\samples\toolbar +copy *.xpm \wxmsw_dist\wxMSW\samples\toolbar +copy *.ico \wxmsw_dist\wxMSW\samples\toolbar +cd bitmaps +md \wxmsw_dist\wxMSW\samples\toolbar\bitmaps +copy *.* \wxmsw_dist\wxMSW\samples\toolbar\bitmaps +cd ..\.. + +echo TreeCtrl sample.. + +cd treectrl +md \wxmsw_dist\wxMSW\samples\treectrl +copy Makefile.* \wxmsw_dist\wxMSW\samples\treectrl +copy *.rc \wxmsw_dist\wxMSW\samples\toolbar +copy *.def \wxmsw_dist\wxMSW\samples\toolbar +copy *.cpp \wxmsw_dist\wxMSW\samples\treectrl +copy *.h \wxmsw_dist\wxMSW\samples\treectrl +copy *.xpm \wxmsw_dist\wxMSW\samples\treectrl +copy *.ico \wxmsw_dist\wxMSW\samples\treectrl +cd .. + +echo typetest sample.. + +cd typetest +md \wxmsw_dist\wxMSW\samples\typetest +copy Makefile.* \wxmsw_dist\wxMSW\samples\typetest +copy *.cpp \wxmsw_dist\wxMSW\samples\typetest +copy *.h \wxmsw_dist\wxMSW\samples\typetest +copy *.ico \wxmsw_dist\wxMSW\samples\typetest +copy *.def \wxmsw_dist\wxMSW\samples\typetest +copy *.rc \wxmsw_dist\wxMSW\samples\typetest +cd .. + +echo Validate sample.. + +cd validate +md \wxmsw_dist\wxMSW\samples\validate +copy Makefile.* \wxmsw_dist\wxMSW\samples\validate +copy *.cpp \wxmsw_dist\wxMSW\samples\validate +copy *.h \wxmsw_dist\wxMSW\samples\validate +copy *.xpm \wxmsw_dist\wxMSW\samples\validate +copy *.rc \wxmsw_dist\wxMSW\samples\validate +copy *.def \wxmsw_dist\wxMSW\samples\validate +cd .. + +echo wxPoem sample.. + +cd wxpoem +md \wxmsw_dist\wxMSW\samples\wxpoem +copy Makefile.* \wxmsw_dist\wxMSW\samples\wxpoem +copy *.cpp \wxmsw_dist\wxMSW\samples\wxpoem +copy *.h \wxmsw_dist\wxMSW\samples\wxpoem +copy *.xpm \wxmsw_dist\wxMSW\samples\wxpoem +copy *.def \wxmsw_dist\wxMSW\samples\wxpoem +copy *.rc \wxmsw_dist\wxMSW\samples\wxpoem +copy wxpoem.dat \wxmsw_dist\wxMSW\samples\wxpoem +copy wxpoem.txt \wxmsw_dist\wxMSW\samples\wxpoem +copy wxpoem.idx \wxmsw_dist\wxMSW\samples\wxpoem +cd .. + +echo wxSocket sample.. + +cd wxsocket +md \wxmsw_dist\wxMSW\samples\wxsocket +copy Makefile.* \wxmsw_dist\wxMSW\samples\wxsocket +copy *.cpp \wxmsw_dist\wxMSW\samples\wxsocket +copy *.h \wxmsw_dist\wxMSW\samples\wxsocket +copy *.rc \wxmsw_dist\wxMSW\samples\wxsocket +copy *.def \wxmsw_dist\wxMSW\samples\wxsocket +copy *.xpm \wxmsw_dist\wxMSW\samples\wxsocket +cd ..\.. + diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index baad6ee061..a85be22c80 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -102,8 +102,8 @@ class MyCanvas: public wxScrolledWindow { public: MyCanvas( MyFrame *parent ); - - void DoDrawTests( int x, int y, wxDC &dc ); + + void DrawTestLines( int x, int y, int width, wxDC &dc ); void OnPaint(wxPaintEvent &event); protected: @@ -207,106 +207,51 @@ MyCanvas::MyCanvas( MyFrame *parent ) m_owner = parent; } -void MyCanvas::DoDrawTests( int x, int y, wxDC &dc ) +void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) { - wxRect rect; - rect.x = dc.LogicalToDeviceX( x-20 ); - rect.y = dc.LogicalToDeviceY( y-20 ); - rect.width = dc.LogicalToDeviceXRel( 500 ); - rect.height = dc.LogicalToDeviceYRel( 200 ); - if (!IsExposed(rect)) return; - - dc.DrawLine( x , y, x , y ); - dc.DrawLine( x+ 20, y, x+ 20, y+ 1 ); - dc.DrawLine( x+ 40, y, x+ 40, y+ 2 ); - dc.DrawLine( x+ 60, y, x+ 60, y+ 3 ); - dc.DrawLine( x+ 80, y, x+ 80, y+ 4 ); - dc.DrawLine( x+100, y, x+100, y+ 5 ); - dc.DrawLine( x+120, y, x+120, y+ 6 ); - dc.DrawLine( x+140, y, x+140, y+10 ); - dc.DrawLine( x+160, y, x+160, y+20 ); - dc.DrawLine( x+180, y, x+180, y+30 ); - - dc.DrawLine( x+200, y, x+200 , y ); - dc.DrawLine( x+220, y, x+220+ 1, y+ 1 ); - dc.DrawLine( x+240, y, x+240+ 2, y+ 2 ); - dc.DrawLine( x+260, y, x+260+ 3, y+ 3 ); - dc.DrawLine( x+280, y, x+280+ 4, y+ 4 ); - dc.DrawLine( x+300, y, x+300+ 5, y+ 5 ); - dc.DrawLine( x+320, y, x+320+ 6, y+ 6 ); - dc.DrawLine( x+340, y, x+340+10, y+10 ); - dc.DrawLine( x+360, y, x+360+20, y+20 ); - dc.DrawLine( x+380, y, x+380+30, y+30 ); - - dc.DrawLine( x+420, y , x+420 , y ); - dc.DrawLine( x+420, y+10, x+420+1, y+10 ); - dc.DrawLine( x+420, y+20, x+420+2, y+20 ); - dc.DrawLine( x+420, y+30, x+420+3, y+30 ); - dc.DrawLine( x+420, y+40, x+420+4, y+40 ); - dc.DrawLine( x+420, y+50, x+420+5, y+50 ); - dc.DrawLine( x+420, y+60, x+420+6, y+60 ); - dc.DrawLine( x+420, y+70, x+420+10, y+70 ); - dc.DrawLine( x+420, y+80, x+420+20, y+80 ); - dc.DrawLine( x+420, y+90, x+420+30, y+90 ); - - y -= 40; - - dc.DrawCircle( x, y+100, 1); - dc.DrawCircle( x, y+110, 2); - dc.DrawCircle( x, y+120, 3); - dc.DrawCircle( x, y+130, 4); - dc.DrawCircle( x, y+140, 5); - dc.DrawCircle( x, y+160, 7); - dc.DrawCircle( x, y+180, 8); - - dc.DrawRectangle( x+50, y+100, 1, 1); - dc.DrawRectangle( x+50, y+110, 2, 2); - dc.DrawRectangle( x+50, y+120, 3, 3); - dc.DrawRectangle( x+50, y+130, 4, 4); - dc.DrawRectangle( x+50, y+140, 5, 5); - dc.DrawRectangle( x+50, y+160, 10, 10); - dc.DrawRectangle( x+50, y+180, 20, 20); - - dc.DrawRoundedRectangle( x+100, y+100, 1, 1, 1); - dc.DrawRoundedRectangle( x+100, y+110, 2, 2, 1); - dc.DrawRoundedRectangle( x+100, y+120, 3, 3, 1); - dc.DrawRoundedRectangle( x+100, y+130, 4, 4, 1); - dc.DrawRoundedRectangle( x+100, y+140, 5, 5, 1); - dc.DrawRoundedRectangle( x+100, y+160, 10, 10, 1); - dc.DrawRoundedRectangle( x+100, y+180, 20, 20, 1); - - dc.DrawRoundedRectangle( x+150, y+100, 1, 1, 2); - dc.DrawRoundedRectangle( x+150, y+110, 2, 2, 2); - dc.DrawRoundedRectangle( x+150, y+120, 3, 3, 2); - dc.DrawRoundedRectangle( x+150, y+130, 4, 4, 2); - dc.DrawRoundedRectangle( x+150, y+140, 5, 5, 2); - dc.DrawRoundedRectangle( x+150, y+160, 10, 10, 2); - dc.DrawRoundedRectangle( x+150, y+180, 20, 20, 2); - - dc.DrawRoundedRectangle( x+200, y+100, 1, 1, 3); - dc.DrawRoundedRectangle( x+200, y+110, 2, 2, 3); - dc.DrawRoundedRectangle( x+200, y+120, 3, 3, 3); - dc.DrawRoundedRectangle( x+200, y+130, 4, 4, 3); - dc.DrawRoundedRectangle( x+200, y+140, 5, 5, 3); - dc.DrawRoundedRectangle( x+200, y+160, 10, 10, 3); - dc.DrawRoundedRectangle( x+200, y+180, 20, 20, 3); - - dc.DrawRoundedRectangle( x+250, y+100, 1, 1, 5); - dc.DrawRoundedRectangle( x+250, y+110, 2, 2, 5); - dc.DrawRoundedRectangle( x+250, y+120, 3, 3, 5); - dc.DrawRoundedRectangle( x+250, y+130, 4, 4, 5); - dc.DrawRoundedRectangle( x+250, y+140, 5, 5, 5); - dc.DrawRoundedRectangle( x+250, y+160, 10, 10, 5); - dc.DrawRoundedRectangle( x+250, y+180, 20, 20, 5); - - dc.DrawRoundedRectangle( x+300, y+100, 1, 1, 10); - dc.DrawRoundedRectangle( x+300, y+110, 2, 2, 10); - dc.DrawRoundedRectangle( x+300, y+120, 3, 3, 10); - dc.DrawRoundedRectangle( x+300, y+130, 4, 4, 10); - dc.DrawRoundedRectangle( x+300, y+140, 5, 5, 10); - dc.DrawRoundedRectangle( x+300, y+160, 10, 10, 10); - dc.DrawRoundedRectangle( x+300, y+180, 20, 20, 10); - + dc.SetPen( wxPen( "black", width, wxSOLID) ); + dc.SetBrush( *wxRED_BRUSH ); + dc.DrawRectangle( x+10, y+10, 400, 190 ); + + dc.SetPen( wxPen( "black", width, wxSOLID) ); + dc.DrawLine( x+20, y+20, 390, y+20 ); + dc.SetPen( wxPen( "black", width, wxDOT) ); + dc.DrawLine( x+20, y+30, 390, y+30 ); + dc.SetPen( wxPen( "black", width, wxSHORT_DASH) ); + dc.DrawLine( x+20, y+40, 390, y+40 ); + dc.SetPen( wxPen( "black", width, wxLONG_DASH) ); + dc.DrawLine( x+20, y+50, 390, y+50 ); + dc.SetPen( wxPen( "black", width, wxDOT_DASH) ); + dc.DrawLine( x+20, y+60, 390, y+60 ); + + dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) ); + dc.DrawLine( x+20, y+70, 390, y+70 ); + dc.SetPen( wxPen( "black", width, wxCROSSDIAG_HATCH) ); + dc.DrawLine( x+20, y+80, 390, y+80 ); + dc.SetPen( wxPen( "black", width, wxFDIAGONAL_HATCH) ); + dc.DrawLine( x+20, y+90, 390, y+90 ); + dc.SetPen( wxPen( "black", width, wxCROSS_HATCH) ); + dc.DrawLine( x+20, y+100, 390, y+100 ); + dc.SetPen( wxPen( "black", width, wxHORIZONTAL_HATCH) ); + dc.DrawLine( x+20, y+110, 390, y+110 ); + dc.SetPen( wxPen( "black", width, wxVERTICAL_HATCH) ); + dc.DrawLine( x+20, y+120, 390, y+120 ); + + wxPen ud( "black", width, wxUSER_DASH ); + wxDash dash1[1]; + dash1[0] = 0; + ud.SetDashes( 1, dash1 ); + dc.DrawLine( x+20, y+140, 390, y+140 ); + dash1[0] = 1; + ud.SetDashes( 1, dash1 ); + dc.DrawLine( x+20, y+150, 390, y+150 ); + dash1[0] = 2; + ud.SetDashes( 1, dash1 ); + dc.DrawLine( x+20, y+160, 390, y+160 ); + dash1[0] = 0xFF; + ud.SetDashes( 1, dash1 ); + dc.DrawLine( x+20, y+170, 390, y+170 ); + } void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) @@ -333,34 +278,14 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) dc.DrawIcon( wxICON(mondrian), 110, 40 ); - dc.SetBrush( *wxRED_BRUSH ); - - int x = 20; - int y = 80; - int step = 200; - - dc.SetPen( wxPen( "black", 1, 0) ); - DoDrawTests( x, y, dc ); - - y += step; - - dc.SetPen( wxPen( "black", 1, wxDOT) ); - DoDrawTests( x, y, dc ); - - y += step; - - dc.SetPen( wxPen( "black", 1, wxSHORT_DASH) ); - DoDrawTests( x, y, dc ); - - y += step; - - dc.SetPen( wxPen( "black", 1, wxLONG_DASH) ); - DoDrawTests( x, y, dc ); - - y += step; - - dc.SetPen( wxPen( "black", 1, wxDOT_DASH) ); - DoDrawTests( x, y, dc ); + DrawTestLines( 0, 20, 0, dc ); + + DrawTestLines( 0, 220, 1, dc ); + + DrawTestLines( 0, 420, 2, dc ); + + DrawTestLines( 0, 620, 6, dc ); + } // ---------------------------------------------------------------------------- @@ -549,7 +474,7 @@ void MyFrame::OnOption(wxCommandEvent &event) return; } - Refresh(); + m_canvas->Refresh(); } void MyFrame::PrepareDC(wxDC& dc) diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 2862a4dcc3..cf710db37d 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -235,6 +235,7 @@ bool wxPen::RealizeResource() wxDash *real_dash ; if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash) { + wxBell(); real_dash = new wxDash[M_PENDATA->m_nbDash] ; int i; for (i=0;im_nbDash;i++) @@ -270,7 +271,7 @@ WXHANDLE wxPen::GetResourceHandle() if ( !M_PENDATA ) return 0; else - return (WXHANDLE)M_PENDATA->m_hPen; + return (WXHANDLE)M_PENDATA->m_hPen; } bool wxPen::FreeResource(bool force) -- 2.45.2