From 72212c2879f4a3ebdf1d8fb49b1ec4341d3370f5 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 6 Sep 1998 14:52:16 +0000 Subject: [PATCH] Various changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 151 +++++++++++++++++++--------- distrib/msw/gtk.rsp | 77 ++++++++++++-- distrib/msw/stubs.rsp | 11 ++ distrib/msw/zipdist.bat | 1 + docs/msw/changes.txt | 12 +++ include/wx/defs.h | 2 +- include/wx/process.h | 2 +- utils/glcanvas/distrib/glcanvas.rsp | 3 + utils/glcanvas/docs/notes.txt | 18 +--- 9 files changed, 205 insertions(+), 72 deletions(-) create mode 100644 distrib/msw/stubs.rsp diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index a1f1bba8d5..f5059c9579 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -8,6 +8,7 @@ docs/upgrade.txt docs/todo.txt docs/licence.txt docs/symbols.txt +docs/*.html src/*.inc src/mkdir @@ -28,7 +29,7 @@ src/generic/*.inc src/png/*.c src/png/*.h -src/png/makefile.* +src/png/makefile* src/png/INSTALL src/png/CHANGES src/png/README @@ -45,7 +46,7 @@ src/zlib/README src/zlib/ChangeLog src/zlib/configure src/zlib/*.txt -src/zlib/makefile.* +src/zlib/makefile* src/zlib/*.com src/zlib/*.3 src/zlib/*.mms @@ -73,9 +74,9 @@ bitmaps/ico/32x32/*.* afm/*.* utils/*.txt -utils/make*.* +utils/make* -utils/xpmshow/src/makefile.* +utils/xpmshow/src/makefile* utils/xpmshow/src/*.cpp utils/xpmshow/src/*.h utils/xpmshow/src/*.def @@ -86,7 +87,7 @@ utils/xpmshow/src/*.ico utils/wxhelp/src/*.cpp utils/wxhelp/src/*.h -utils/wxhelp/src/makefile.* +utils/wxhelp/src/makefile* utils/wxhelp/src/*.xbm utils/wxhelp/src/*.xpm utils/wxhelp/src/*.txt @@ -115,7 +116,7 @@ utils/tex2rtf/tools/tcheck/*.bat utils/wxtree/src/*.cpp utils/wxtree/src/*.h -utils/wxtree/src/makefile.* +utils/wxtree/src/makefile* utils/wxtree/src/*.xbm utils/wxtree/src/*.xpm utils/wxtree/lib/dummy @@ -126,7 +127,7 @@ utils/wxtree/src/*.rc utils/wxgraph/src/*.cpp utils/wxgraph/src/*.c utils/wxgraph/src/*.h -utils/wxgraph/src/makefile.* +utils/wxgraph/src/makefile* utils/wxgraph/src/*.xbm utils/wxgraph/src/*.xpm utils/wxgraph/lib/dummy @@ -138,7 +139,7 @@ utils/mfutils/src/*.cpp utils/mfutils/src/*.h utils/mfutils/src/*.rc utils/mfutils/src/*.def -utils/mfutils/src/makefile.* +utils/mfutils/src/makefile* utils/mfutils/src/*.txt utils/mfutils/lib/dummy utils/mfutils/src/*.ico @@ -149,7 +150,7 @@ utils/mfutils/src/*.ico utils/rcparser/src/*.cpp utils/rcparser/src/*.c utils/rcparser/src/*.h -utils/rcparser/src/makefile.* +utils/rcparser/src/makefile* utils/rcparser/src/*.xbm utils/rcparser/src/*.xpm utils/rcparser/lib/dummy @@ -162,16 +163,26 @@ utils/colours/*.h utils/colours/*.cpp utils/colours/*.def utils/colours/*.rc -utils/colours/makefile.* +utils/colours/makefile* utils/colours/*.xbm utils/colours/*.xpm utils/colours/*.txt +utils/serialize/*.h +utils/serialize/*.cpp +utils/serialize/*.def +utils/serialize/*.rc +utils/serialize/makefile* +utils/serialize/*.xbm +utils/serialize/*.xpm +utils/serialize/*.txt + +utils/wxprop/Makefile utils/wxprop/src/*.h utils/wxprop/src/*.cpp utils/wxprop/src/*.def utils/wxprop/src/*.rc -utils/wxprop/src/makefile.* +utils/wxprop/src/makefile* utils/wxprop/src/*.xbm utils/wxprop/src/*.xpm utils/wxprop/src/*.txt @@ -179,13 +190,14 @@ utils/wxprop/src/*.ico utils/wxprop/src/*.bmp utils/wxprop/lib/dummy +utils/dialoged/Makefile utils/dialoged/src/bitmaps/*.xbm utils/dialoged/src/bitmaps/*.xpm utils/dialoged/src/*.h utils/dialoged/src/*.cpp utils/dialoged/src/*.def utils/dialoged/src/*.rc -utils/dialoged/src/makefile.* +utils/dialoged/src/makefile* utils/dialoged/src/*.xbm utils/dialoged/src/*.xpm utils/dialoged/src/*.txt @@ -199,19 +211,66 @@ utils/dialoged/src/bitmaps/*.ico utils/dialoged/test/*.cpp utils/dialoged/test/*.def utils/dialoged/test/*.rc -utils/dialoged/test/makefile.* +utils/dialoged/test/makefile* utils/dialoged/lib/dummy utils/dialoged/test/*.ico utils/dialoged/test/*.prj utils/dialoged/test/*.bmp +utils/glcanvas/Makefile +utils/glcanvas/win/*.h +utils/glcanvas/win/*.cpp +utils/glcanvas/win/*.def +utils/glcanvas/win/*.rc +utils/glcanvas/win/makefile* +utils/glcanvas/win/*.xbm +utils/glcanvas/win/*.xpm +utils/glcanvas/win/*.txt +utils/glcanvas/win/*.ico +utils/glcanvas/win/*.bmp +utils/glcanvas/src/*.h +utils/glcanvas/src/*.cpp +utils/glcanvas/src/*.def +utils/glcanvas/src/*.rc +utils/glcanvas/src/makefile* +utils/glcanvas/src/*.xbm +utils/glcanvas/src/*.xpm +utils/glcanvas/src/*.txt +utils/glcanvas/src/*.ico +utils/glcanvas/src/*.bmp +utils/glcanvas/samples/cube/*.h +utils/glcanvas/samples/cube/*.cpp +utils/glcanvas/samples/cube/*.def +utils/glcanvas/samples/cube/*.rc +utils/glcanvas/samples/cube/makefile* +utils/glcanvas/samples/cube/*.xbm +utils/glcanvas/samples/cube/*.xpm +utils/glcanvas/samples/cube/*.txt +utils/glcanvas/samples/cube/*.ico +utils/glcanvas/samples/cube/*.bmp +utils/glcanvas/samples/isosurf/*.h +utils/glcanvas/samples/isosurf/*.cpp +utils/glcanvas/samples/isosurf/*.def +utils/glcanvas/samples/isosurf/*.rc +utils/glcanvas/samples/isosurf/makefile* +utils/glcanvas/samples/isosurf/*.xbm +utils/glcanvas/samples/isosurf/*.xpm +utils/glcanvas/samples/isosurf/*.txt +utils/glcanvas/samples/isosurf/*.ico +utils/glcanvas/samples/isosurf/*.bmp +utils/glcanvas/samples/isosurf/*.gz +utils/glcanvas/docs/*.tex +utils/glcanvas/docs/*.txt +utils/glcanvas/docs/*.bmp +utils/glcanvas/docs/*.gif + samples/*.txt -samples/makefile.* +samples/makefile* samples/config/*.cpp samples/config/*.h samples/config/*.def -samples/config/makefile*.* +samples/config/makefile* samples/config/*.xbm samples/config/*.xpm samples/config/*.txt @@ -223,7 +282,7 @@ samples/config/*.wav samples/dynamic/*.cpp samples/dynamic/*.h samples/dynamic/*.def -samples/dynamic/makefile*.* +samples/dynamic/makefile* samples/dynamic/*.xbm samples/dynamic/*.xpm samples/dynamic/*.txt @@ -235,7 +294,7 @@ samples/dynamic/*.wav samples/bombs/*.cpp samples/bombs/*.h samples/bombs/*.def -samples/bombs/makefile*.* +samples/bombs/makefile* samples/bombs/*.xbm samples/bombs/*.xpm samples/bombs/*.txt @@ -246,7 +305,7 @@ samples/bombs/*.rc samples/ipc/*.cpp samples/ipc/*.h samples/ipc/*.def -samples/ipc/makefile*.* +samples/ipc/makefile* samples/ipc/*.xbm samples/ipc/*.xpm samples/ipc/*.ico @@ -257,7 +316,7 @@ samples/types/*.h samples/types/*.def samples/types/*.rc samples/types/*.txt -samples/types/makefile*.* +samples/types/makefile* samples/types/*.xbm samples/types/*.xpm samples/types/*.ico @@ -268,7 +327,7 @@ samples/resource/*.def samples/resource/*.rc samples/resource/*.txt samples/resource/*.wxr -samples/resource/makefile*.* +samples/resource/makefile* samples/resource/*.xbm samples/resource/*.xpm samples/resource/*.ico @@ -276,7 +335,7 @@ samples/resource/*.ico samples/animate/*.cpp samples/animate/*.h samples/animate/*.def -samples/animate/makefile*.* +samples/animate/makefile* samples/animate/*.xbm samples/animate/*.xpm samples/animate/*.ico @@ -285,18 +344,20 @@ samples/animate/*.rc samples/mdi/*.cpp samples/mdi/*.h samples/mdi/*.def -samples/mdi/makefile*.* +samples/mdi/makefile* samples/mdi/*.xbm samples/mdi/*.xpm samples/mdi/*.ico samples/mdi/*.rc samples/mdi/bitmaps/*.bmp samples/mdi/bitmaps/*.ico +samples/mdi/bitmaps/*.xpm +samples/mdi/bitmaps/*.xbm samples/minimal/*.cpp samples/minimal/*.h samples/minimal/*.def -samples/minimal/makefile*.* +samples/minimal/makefile* samples/minimal/*.xbm samples/minimal/*.xpm samples/minimal/*.ico @@ -305,7 +366,7 @@ samples/minimal/*.rc samples/controls/*.cpp samples/controls/*.h samples/controls/*.def -samples/controls/makefile*.* +samples/controls/makefile* samples/controls/*.xbm samples/controls/*.xpm samples/controls/*.ico @@ -315,7 +376,7 @@ samples/controls/*.rc samples/fractal/*.cpp samples/fractal/*.h samples/fractal/*.def -samples/fractal/makefile*.* +samples/fractal/makefile* samples/fractal/*.xbm samples/fractal/*.xpm samples/fractal/*.ico @@ -324,7 +385,7 @@ samples/fractal/*.rc samples/layout/*.cpp samples/layout/*.h samples/layout/*.def -samples/layout/makefile*.* +samples/layout/makefile* samples/layout/*.xbm samples/layout/*.xpm samples/layout/*.ico @@ -334,7 +395,7 @@ samples/layout/*.bmp samples/printing/*.cpp samples/printing/*.h samples/printing/*.def -samples/printing/makefile*.* +samples/printing/makefile* samples/printing/*.xbm samples/printing/*.xpm samples/printing/*.txt @@ -346,7 +407,7 @@ samples/printing/*.afm samples/toolbar/*.cpp samples/toolbar/*.h samples/toolbar/*.def -samples/toolbar/makefile*.* +samples/toolbar/makefile* samples/toolbar/*.txt samples/toolbar/*.xbm samples/toolbar/*.xpm @@ -361,7 +422,7 @@ samples/docview/*.h samples/docview/*.cpp samples/docview/*.def samples/docview/*.rc -samples/docview/makefile*.* +samples/docview/makefile* samples/docview/*.xbm samples/docview/*.xpm samples/docview/*.txt @@ -372,7 +433,7 @@ samples/memcheck/*.h samples/memcheck/*.cpp samples/memcheck/*.def samples/memcheck/*.rc -samples/memcheck/makefile*.* +samples/memcheck/makefile* samples/memcheck/*.xbm samples/memcheck/*.xpm samples/memcheck/*.txt @@ -383,7 +444,7 @@ samples/odbc/*.h samples/odbc/*.cpp samples/odbc/*.def samples/odbc/*.rc -samples/odbc/makefile*.* +samples/odbc/makefile* samples/odbc/*.inf samples/odbc/*.xbm samples/odbc/*.xpm @@ -396,7 +457,7 @@ samples/dialogs/*.h samples/dialogs/*.cpp samples/dialogs/*.def samples/dialogs/*.rc -samples/dialogs/makefile*.* +samples/dialogs/makefile* samples/dialogs/*.xbm samples/dialogs/*.xpm samples/dialogs/*.txt @@ -409,7 +470,7 @@ samples/wxpoem/*.def samples/wxpoem/*.rc samples/wxpoem/*.inf samples/wxpoem/*.txt -samples/wxpoem/makefile*.* +samples/wxpoem/makefile* samples/wxpoem/*.xbm samples/wxpoem/*.xpm samples/wxpoem/*.ico @@ -423,7 +484,7 @@ samples/pressup/*.def samples/pressup/*.rc samples/pressup/*.inf samples/pressup/*.txt -samples/pressup/makefile*.* +samples/pressup/makefile* samples/pressup/*.xbm samples/pressup/*.xpm samples/pressup/*.ico @@ -435,7 +496,7 @@ samples/validate/*.def samples/validate/*.rc samples/validate/*.inf samples/validate/*.txt -samples/validate/makefile*.* +samples/validate/makefile* samples/validate/*.xbm samples/validate/*.xpm samples/validate/*.ico @@ -447,7 +508,7 @@ samples/events/*.def samples/events/*.rc samples/events/*.inf samples/events/*.txt -samples/events/makefile*.* +samples/events/makefile* samples/events/*.xbm samples/events/*.xpm samples/events/*.ico @@ -458,7 +519,7 @@ samples/treectrl/*.h samples/treectrl/*.def samples/treectrl/*.rc samples/treectrl/*.txt -samples/treectrl/makefile*.* +samples/treectrl/makefile* samples/treectrl/*.xbm samples/treectrl/*.xpm samples/treectrl/bitmaps/*.xbm @@ -473,7 +534,7 @@ samples/listctrl/*.h samples/listctrl/*.def samples/listctrl/*.rc samples/listctrl/*.txt -samples/listctrl/makefile*.* +samples/listctrl/makefile* samples/listctrl/*.xbm samples/listctrl/*.xpm samples/listctrl/bitmaps/*.xbm @@ -488,7 +549,7 @@ samples/splitter/*.h samples/splitter/*.def samples/splitter/*.rc samples/splitter/*.txt -samples/splitter/makefile*.* +samples/splitter/makefile* samples/splitter/*.xbm samples/splitter/*.xpm samples/splitter/*.ico @@ -499,7 +560,7 @@ samples/grid/*.h samples/grid/*.def samples/grid/*.rc samples/grid/*.txt -samples/grid/makefile*.* +samples/grid/makefile* samples/grid/*.xbm samples/grid/*.xpm samples/grid/*.ico @@ -510,7 +571,7 @@ samples/internat/*.h samples/internat/*.def samples/internat/*.rc samples/internat/*.txt -samples/internat/makefile*.* +samples/internat/makefile* samples/internat/*.xbm samples/internat/*.xpm samples/internat/*.po @@ -523,7 +584,7 @@ samples/checklst/*.h samples/checklst/*.def samples/checklst/*.rc samples/checklst/*.txt -samples/checklst/makefile*.* +samples/checklst/makefile* samples/checklst/*.xbm samples/checklst/*.xpm samples/checklst/*.ico @@ -531,7 +592,7 @@ samples/checklst/*.bmp samples/dnd/*.cpp samples/dnd/*.h -samples/dnd/makefile*.* +samples/dnd/makefile* samples/dnd/*.rc samples/dnd/*.def samples/dnd/*.bmp @@ -542,7 +603,7 @@ samples/dnd/*.txt samples/tab/*.cpp samples/tab/*.h -samples/tab/makefile*.* +samples/tab/makefile* samples/tab/*.rc samples/tab/*.def samples/tab/*.bmp @@ -553,7 +614,7 @@ samples/tab/*.txt samples/png/*.cpp samples/png/*.h -samples/png/makefile*.* +samples/png/makefile* samples/png/*.rc samples/png/*.def samples/png/*.bmp diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp index f5814f55a5..3088ce4771 100644 --- a/distrib/msw/gtk.rsp +++ b/distrib/msw/gtk.rsp @@ -2,10 +2,18 @@ install-sh Makefile template.mak TODO.txt +configure +configure.in +config.guess +config.sub +wx-config.in +mkinstalldirs docs/gtk/*.html +docs/gtk/*.txt + +include/wx/gtk/*.h -src/mkdirs src/Makefile src/Makefile.in src/*.inc @@ -15,12 +23,6 @@ src/gtk/*.c src/gtk/*.inc src/gtk/*.xbm -src/gtk/setup/*.hin -src/gtk/setup/*.in -src/gtk/setup/rules/* -src/gtk/setup/rules/generic/* -src/gtk/setup/rules/linux/* - src/gdk_imlib/*.c src/gdk_imlib/*.h src/gdk_imlib/AUTHORS @@ -41,11 +43,57 @@ src/iodbc/build src/iodbc/Changes.log src/iodbc/postgres/*.h -install/gtk/* +setup/*.in +setup/*.hin -misc/afm/* -misc/gs_afm/* -misc/imlib/* +setup/general/createall +setup/general/jointar +setup/general/makeapp +setup/general/makedirs +setup/general/makedoc +setup/general/mygrep +setup/general/needed + +setup/rules/bin +setup/rules/bin2 +setup/rules/doc +setup/rules/gbin +setup/rules/gbin2 +setup/rules/glib +setup/rules/glibbin +setup/rules/glibgbin +setup/rules/gslib +setup/rules/lib +setup/rules/libbin +setup/rules/libgbin + +setup/rules/generic/bin1 +setup/rules/generic/bin1gen +setup/rules/generic/bin2 +setup/rules/generic/bin2gen +setup/rules/generic/depend +setup/rules/generic/globals +setup/rules/generic/lib +setup/rules/generic/needed +setup/rules/generic/obj +setup/rules/generic/slib +setup/rules/generic/sobj + +setup/shared/sharedAIX +setup/shared/sharedBsd +setup/shared/sharedDgux +setup/shared/sharedHpux +setup/shared/sharedIrix +setup/shared/sharedLinux +setup/shared/sharedOSF +setup/shared/sharedSolaris2 +setup/shared/sharedSunos4 +setup/shared/sharedSysV + +misc/afm/*.afm +misc/gs_afm/*.afm +misc/imlib/imrc +misc/imlib/*.pal user/Makefile @@ -67,3 +115,10 @@ user/wxTest/Makefile.in user/wxTest/*.xpm user/wxTest/*.png +user/wxLayout/*.cpp +user/wxLayout/*.h +user/wxLayout/Makefile +user/wxLayout/Makefile.in +user/wxLayout/*.xpm +user/wxLayout/*.png + diff --git a/distrib/msw/stubs.rsp b/distrib/msw/stubs.rsp new file mode 100644 index 0000000000..2b0b67041f --- /dev/null +++ b/distrib/msw/stubs.rsp @@ -0,0 +1,11 @@ +src/stubs/*.cpp +src/stubs/*.h +src/stubs/makefile* +src/stubs/*.inc + +include/wx/stubs/*.h +include/wx/stubs/*.rc + +lib/dummy + + diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index fa765e1b4a..5489304a08 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -17,6 +17,7 @@ echo Zipping... zip32 -@ %dest\wx200gen.zip < %src\distrib\msw\generic.rsp zip32 -@ %dest\wx200msw.zip < %src\distrib\msw\msw.rsp zip32 -@ %dest\wx200gtk.zip < %src\distrib\msw\gtk.rsp +zip32 -@ %dest\wx200stubs.zip < %src\distrib\msw\stubs.rsp zip32 -@ %dest\wx200doc.zip < %src\distrib\msw\docsrc.rsp zip32 -@ %dest\wx200hlp.zip < %src\distrib\msw\wx_hlp.rsp diff --git a/docs/msw/changes.txt b/docs/msw/changes.txt index 5af8da209b..9e1d0ca652 100644 --- a/docs/msw/changes.txt +++ b/docs/msw/changes.txt @@ -2,6 +2,18 @@ wxWindows 2.0 for Windows Change Log ------------------------------------ +Alpha 15, August 31st 1998 +-------------------------- + +- wxBitmap debugged. +- wxDC::GetDepth added. +- Contribution added whereby wxBitmap will be + converted to DC depth if they don't match. +- wxConfig API improved, documentation updated. +- Printing classes name conventions cleaned up. +- wxUpdateUIEvent now derives from wxCommandEvent + so event can travel up the window hierachy. + Alpha 14, July 31st 1998 ------------------------ diff --git a/include/wx/defs.h b/include/wx/defs.h index b4fb9a7b29..843ea408c8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -686,7 +686,7 @@ enum wxDataFormat // Virtual keycodes -enum _Virtual_keycodes { +enum wxKeyCode { WXK_BACK = 8, WXK_TAB = 9, WXK_RETURN = 13, diff --git a/include/wx/process.h b/include/wx/process.h index a6dc295a62..94788268cb 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -52,7 +52,7 @@ class WXDLLEXPORT wxProcessEvent: public wxEvent typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&); -#define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL}, +#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL}, #endif // _WX_PROCESSH__ diff --git a/utils/glcanvas/distrib/glcanvas.rsp b/utils/glcanvas/distrib/glcanvas.rsp index 8467e21712..c16e2c560e 100644 --- a/utils/glcanvas/distrib/glcanvas.rsp +++ b/utils/glcanvas/distrib/glcanvas.rsp @@ -2,6 +2,9 @@ docs/*.* win/*.cpp win/*.h win/make*.* +src/*.cpp +src/*.h +src/make*.* samples/cube/*.cpp samples/cube/*.h samples/cube/*.rc diff --git a/utils/glcanvas/docs/notes.txt b/utils/glcanvas/docs/notes.txt index d7c392cc87..c2049028dc 100644 --- a/utils/glcanvas/docs/notes.txt +++ b/utils/glcanvas/docs/notes.txt @@ -1,15 +1,5 @@ -Problems with wxGLCanvas, 29/8/98 +wxGLCanvas +---------- -Only the cube example compiles under wxWin 2 so far. - -Major problem: OpenGL seems to do something strange to the -event loop, because wxApp::OnIdle never gets a chance to be -called, and therefore delayed deletion (and all other -idle-related processing) doesn't get done. This is why closing -the app doesn't work. - -What does OpenGL do to message processing, and what can be done -about it? Why did it work OK for wxWin 1.xx? It's as if -there's _always_ a message in the queue (PeekMessage always -returns non-zero). Perhaps we need to discover what the message -is it's always returning. +No known issues, though probably palettes aren't correctly +handled under Windows.