Compare commits

..

2134 Commits

Author SHA1 Message Date
Bryan Petty
e381357d4f This commit was manufactured by cvs2svn to create tag
'scintilla-extrafont'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/scintilla-extrafont@25750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 22:35:11 +00:00
Robin Dunn
e0e5663fe4 Allow an extra flag to be given to Font::Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 22:35:11 +00:00
Robin Dunn
75c60b3e65 Use wxStaticCast
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 22:13:12 +00:00
Vadim Zeitlin
4fa908c3bf another part of adding error checking to event table macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 22:00:53 +00:00
Václav Slavík
7b56015f90 make it possible to override translatable status of text entry
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 20:10:56 +00:00
Václav Slavík
fb2e90c174 load wsock32.dll dynamically, so that wxCore has no dependency on it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 20:03:48 +00:00
Stefan Csomor
75dd6ce410 corrected sleep
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:22:14 +00:00
Stefan Csomor
ac86379e2a non-unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:19:23 +00:00
Stefan Csomor
e71800ba3a cleanup and fix of double disposal (thanks to Steve Hartwell)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:15:42 +00:00
Stefan Csomor
79a73b4f86 conversion corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:13:53 +00:00
Stefan Csomor
439ddeba9d removing unreached code (overriden)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:13:03 +00:00
Stefan Csomor
63ff6f538e common code, cleanup of measurement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:11:55 +00:00
Stefan Csomor
8c3f9495d5 common code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:11:03 +00:00
Stefan Csomor
7a21e692d2 added condition for DARWIN (thanks to Steve Hartwell)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 15:08:47 +00:00
Chris Elliott
8dfb846e80 try to fix D Mars compilation for Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 14:34:22 +00:00
Václav Slavík
2a536376ec added public methods to select parts of displayed page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 12:14:40 +00:00
Václav Slavík
00ee93d7e4 added public methods to select parts of displayed page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 12:01:31 +00:00
Stefan Csomor
4a6a2972a2 turning off sound, movies and images for textctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 06:50:10 +00:00
Robin Dunn
3adfb63b39 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 00:25:38 +00:00
Robin Dunn
edfeb1b84d Use "wxCheckListBox" instead of the deprecated "wxCheckList"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 00:22:50 +00:00
Robin Dunn
b159c5c481 Updates to reflect recent changes in wxWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 00:21:37 +00:00
Robin Dunn
7309deeafc Added missing wxNcPaintEventFunction and used it in EVT_NC_PAINT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 00:18:21 +00:00
Vadim Zeitlin
ca7b163fc2 reversed last accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 23:46:51 +00:00
Vadim Zeitlin
1562206871 use static_cast<> in event table macros for type safety (patch 843206)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 23:46:28 +00:00
Robin Dunn
864db5de61 Fixed a compliation error, event args should not be const.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 23:40:59 +00:00
Robin Dunn
b0803032d3 Update the version number, remove mentioon of the wx.py.wxd module
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:56:56 +00:00
Vadim Zeitlin
244e5e34c2 allow generating PS on an output stream and not only a FILE (patch 876362)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:46:12 +00:00
Vadim Zeitlin
0891fcb11f reverted wxStaticCast change which obviously can't work as there is already a wxStaticCast in wx/object.h...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:17:30 +00:00
Stefan Neis
3fe7375573 Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:16:55 +00:00
Vadim Zeitlin
3a818b15a1 use static_cast<> in event table macros for type safety (patch 843206)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:15:19 +00:00
Vadim Zeitlin
0613b80c17 added wxStaticCast, moved wxConstCast from wx/object.h to wx/defs.h for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 22:11:14 +00:00
Vadim Zeitlin
ecfd48ca08 added HAVE_STATIC_CAST
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 21:49:22 +00:00
Vadim Zeitlin
1782be3169 compilation fix for wxUSE_LOG == 0 (part of patch 843206)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 21:16:58 +00:00
Vadim Zeitlin
b1f50e652c restored defaults in switchs removed in the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 19:30:20 +00:00
Vadim Zeitlin
78f1210463 implemented SelectItem(item, bool); UnselectItem() and ToggleItemSelection()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 19:14:41 +00:00
Vadim Zeitlin
e55e94865f added base array of size_t as under Win64 size_t > long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 19:11:31 +00:00
Vadim Zeitlin
3e9af289ed added wxTreeCtrl::UnselectItem() and ToggleItemSelection() (includes patch 832281)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 18:58:27 +00:00
Vadim Zeitlin
6bba111cc6 added auto check count as otherwise calling EnableAutoCheck() twice in a row resulted in problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 18:21:36 +00:00
Stefan Csomor
21f9e95380 because some sash code draws whether the window is visible or not, the easiest thing is to make the MacGetVisibleRegion return an empty region for this case, so the wxDC is always entirely clipped
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 17:29:48 +00:00
Chris Elliott
d833907230 fix for non-unicode DMC builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 15:04:30 +00:00
Jouk Jansen
9cc454c051 Committing in .
Updating OpenVMS compile support

 Modified Files:
 	wxWindows/descrip.mms wxWindows/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 14:57:37 +00:00
Vadim Zeitlin
94a77ff7af fixed the value returned by GetSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 14:41:06 +00:00
Vadim Zeitlin
485cd20763 compiles under win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 13:03:19 +00:00
Vadim Zeitlin
4eb7c4b180 part of Ictrl -> Iscntrl change I forgot to commit (not important, anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 13:02:59 +00:00
Vadim Zeitlin
975b6bcf9b Win64 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 13:02:51 +00:00
Vadim Zeitlin
af5b273c11 Win64 compilation fixes: use wxUIntPtr instead of long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 12:58:23 +00:00
Vadim Zeitlin
a369f7c88a Win64 compilation fixes: define SIZEOF_SIZE_T, added wxUIntPtr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 12:58:08 +00:00
Vadim Zeitlin
d2213b1fa5 added base array of size_t as under Win64 size_t > long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 12:57:11 +00:00
Vadim Zeitlin
5171ea0ea9 added wxGet/SetWindowProc/UserData()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 12:56:25 +00:00
Václav Slavík
b6dc1b9063 fixed samples compilation when using configure and mingw (missing include for windres)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 11:19:46 +00:00
Václav Slavík
afb21636a4 use generic samples icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 09:28:04 +00:00
Vadim Zeitlin
f3f0d961af don't just drop click events resulting from triple clicks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 23:28:13 +00:00
Vadim Zeitlin
d41f7b2041 no changes, simply added a comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 23:20:04 +00:00
Vadim Zeitlin
cc61d2eb40 size combobox/choices properly initially by considering the length of the strings specified in the ctor/Create() (bug 893380)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 23:19:31 +00:00
Vadim Zeitlin
be708d3f3b use correct name for the icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 23:01:44 +00:00
Vadim Zeitlin
b9b8a2b5d7 don't assert when creating an initially empty wxCB_READONLY combobox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 22:30:47 +00:00
Vadim Zeitlin
5982852a06 multiline checkbox doesn't make sense for listbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 22:04:14 +00:00
Robin Dunn
5d06f362eb wxUSE_VC_CRTDBG needs to be dependent on wxUSE_MEMORY_TRACING too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 22:00:36 +00:00
Julian Smart
c36f1fc7c9 Changed no-remap to msw.remap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 21:44:57 +00:00
Vadim Zeitlin
d85c53a5cc wxUniv compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 21:41:23 +00:00
Julian Smart
a6f28223ee Applied WinCE fix, though data file still not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 21:37:32 +00:00
Dimitri Schoolwerth
17d31882db Applied patch #885752: "wxPoem less MSW specific + cleanup".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 20:01:55 +00:00
Julian Smart
33c4f27fe5 Documented no-remap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 16:14:38 +00:00
Julian Smart
6e724836cb Documented tbar95.cpp backports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 16:04:06 +00:00
Julian Smart
dfa5360916 Added no-remap system option so colourful toolbar buttons
aren't mangled
Toolbar buttons are now centred if the bitmap size is smaller
than the specified default size


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 16:02:28 +00:00
Julian Smart
7f0da36965 Fix needed for free MS SDK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 16:00:54 +00:00
Dimitri Schoolwerth
beb966c53d MinGW warnings fixed; TRUE/FALSE cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 12:06:55 +00:00
David Elliott
6d034f7d78 Do not try to set the proper position if creating a window with a NULL parent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 05:12:38 +00:00
David Elliott
eafde5c739 Implement right mouse down/dragged/up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 05:01:23 +00:00
David Elliott
6ba13ca442 When destroying the window, only remove it from its Cocoa parent if
the Cocoa window for its wxWindows parent is its Cocoa parent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 04:44:30 +00:00
David Elliott
1d2fe15e71 Don't close dialogs in ~wxDialog as it just hides other problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 03:46:14 +00:00
David Elliott
9a6e13a6f7 wxBitmap::GetNSImage(): Added trace messages. Release maskImage.
wxMask_CreateFromBitmapData(): Don't clobber byte past the end of dest buffer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 03:27:47 +00:00
Patrick K. O'Brien
d351525a9b shell.autoCompleteAutoHide added with default of True.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-09 02:53:13 +00:00
Julian Smart
1e8bd6b2ae Fixed Unicode breakage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 23:22:01 +00:00
Robert Roebling
518c393914 Fix redraw problem in multiple selection listctrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 23:17:49 +00:00
Robert Roebling
35468934e0 Improvements for splitter sash hack. GTK2 look
good now, GTK1.2 jumps two pixels for some
    reason.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 23:00:53 +00:00
Stefan Neis
0fe2cb22d5 Script install-sh wants a '-c' parameter, otherwise it 'moves' the header
files instead of copying them.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 22:54:05 +00:00
Vadim Zeitlin
23fbd31a9b added WC_NO_BEST_FIT_CHARS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 22:09:13 +00:00
Vadim Zeitlin
a6c811617b resolving conflicts in files I had forgot to commit (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 22:04:51 +00:00
Julian Smart
5a30d45018 Spacing corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 22:01:36 +00:00
Patrick K. O'Brien
07b87e8d9b Fixed problem with Calltip tab not refreshing properly on Windows.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 21:48:07 +00:00
Dimitri Schoolwerth
6efbb55bf6 Fixed relative paths to lib/.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 21:39:56 +00:00
Julian Smart
15a07f5cac New versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 21:37:57 +00:00
Robert Roebling
03eccb8316 Corrected redrawing of sash when resizing
the columns. No longer any ghost line.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 20:58:05 +00:00
Robert Roebling
9b3119232c Draw listctrls's headers right for themes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 20:37:28 +00:00
Robert Roebling
cabeffb029 Correctly center lables vertically.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 20:36:09 +00:00
Julian Smart
c1b9e143e9 0 -> 0u to keep gcc happy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 20:33:07 +00:00
Julian Smart
9369f1474e Added missing MSWGetStyle prototype
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 20:01:16 +00:00
Julian Smart
ef59847c6c wx2msPenStyle forward declaration required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 19:37:47 +00:00
Patrick K. O'Brien
65d005e44d Cosmetic changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 19:28:51 +00:00
Vadim Zeitlin
abfff787c7 updated the year
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:58:31 +00:00
Vadim Zeitlin
14c7f3dd48 add line breaks in the base classes list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:56:27 +00:00
Vadim Zeitlin
02c6137ec1 make it clear that the size returned by Fit() is window, not client, size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:56:07 +00:00
Vadim Zeitlin
74f4dabba9 wxBUFFER_DC_DEFAULT should be wxBUFFER_DC_OVERWRITE_BG, not PRESERVE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:54:04 +00:00
Julian Smart
461fb267e6 Misc documentation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:48:55 +00:00
Julian Smart
dc103d1a54 Added makefile for making documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 18:09:37 +00:00
Julian Smart
78313c3347 Added Release Unicode DLL and Debug Unicode DLL (identical
to non-DLL configurations) in order to get appropriate
regex configuration compiled when wxWindows is compiled via
wxWindows.dsw. Closes bug 877037.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 17:30:54 +00:00
Stefan Neis
60d876f374 Applied and extended patch 886524 (wxGridCellFloatEditor doesn't
accept '.' and '-').


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 16:27:22 +00:00
Vadim Zeitlin
16dd61ac10 don't use char hook to handle Esc in the dialogs, it is too blunt and prevents us from using it for the other purposes such as closing popup menus (bug 884713)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 16:20:02 +00:00
Julian Smart
014249a8f0 Fixed bug [ 849168 ] wxGenericDirCtrl missing wxPROPERTY_FLAGS section for RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 16:13:12 +00:00
Vadim Zeitlin
f60e797e90 estimate size of multiline text controls more accurately (bug 873277)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:52:37 +00:00
Julian Smart
ce994095c6 Closed doc bug [ 412032 ] wxGrid SetCellAlignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:51:13 +00:00
Julian Smart
70ffa79cc9 Document deletion of all items in SetWindowStyleFlag for wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:40:55 +00:00
Julian Smart
c8abcf3309 Fixed [ 855507 ] typo in wxFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:39:29 +00:00
Vadim Zeitlin
2d1715aa46 fixed wxEVT_CONTEXT_MENU generation (it works differently under w2k/XP than under NT4 apparently...) (partly fixes bug 861510)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:38:54 +00:00
Julian Smart
98b100e271 Fixed doc bug [ 871974 ] wxCursor(bits, ...) constructor misses fg and bg in doc
Jay Berkenbilt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:34:16 +00:00
Vadim Zeitlin
c25f373e2b as after recent change wxID_SEPARATOR is now -2, it is better for idMenuTitle to be different from -2 as otherwise we have separators instead of menu titles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:29:41 +00:00
Vadim Zeitlin
684571809d don't try O(N) actions in virtual view, this gives impression that the sample hangs (as in bug 857038)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:16:21 +00:00
Julian Smart
055898b8f0 Fixed [ 875952 ] Win32 wxListControl::FindItem documentation wrong
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:13:44 +00:00
Vadim Zeitlin
f2e5c08285 ugly attempt to fix compilation for BCB 6 (bug 819700)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:06:29 +00:00
Julian Smart
22c9005dd4 Fixed bug [ 865999 ] wxRETAINED windows appear blank on MSW.
wxRETAINED defined to 0 on non-Motif platforms to avoid
clash with wxPOPUP_WINDOW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:03:28 +00:00
Vadim Zeitlin
97c611f847 fixed and documented GetItemText/BackgroundColour() (closes bug 812907)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:02:22 +00:00
Vadim Zeitlin
9f7948af90 don't call SelectObject() twice in SetBrush() nor SetFont() neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:45:07 +00:00
Vadim Zeitlin
550049c260 renamed wxEventFixModule to wxWakeUpIdleModule; added error checking; slight code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:38:35 +00:00
Vadim Zeitlin
ee50eab8d9 added GetHbrush() and GetHbrushOf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:27:56 +00:00
Vadim Zeitlin
b5371ab8cd don't call SelectObject() twice in SetPen() (slow!); don't do anything if setting the same pen and handle errors betters (should fix bug 811415)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:22:12 +00:00
Vadim Zeitlin
5c57bf07fa fixed operator=(), ==() and !=() for wxPen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:20:50 +00:00
Vadim Zeitlin
6c6bf502f9 fixed small bug in operator=() (comparing equal but not identical objects were not assigned though they should be)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 14:07:35 +00:00
Vadim Zeitlin
7577637342 added GetHpen() and GetHpenOf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:54:43 +00:00
Vadim Zeitlin
82a306b728 define WXMICROWIN_CHECK_HDC macro once instead of having #ifdefs for microwin everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:40:08 +00:00
Vadim Zeitlin
0f07e3dc24 use wxBusyCursor class instead of wxBeginBusyCursor and several (mismatched and thus provoking assert failures) wxEndCursors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:30:23 +00:00
Stefan Csomor
590e21b0e2 proper UTF32 / 16 conversions added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:24:35 +00:00
Stefan Csomor
6bdd4f5d1e wchar_t 4 bytes support added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:23:41 +00:00
Stefan Csomor
55094d8b35 redraw forced for size changes (layout for measuring is simpler than word-wrapping drawing code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:22:53 +00:00
Vadim Zeitlin
9cb57df493 use hard coded default size for top level windows instead of CW_USEDEFAULT: this results in more decent default frame size and fixes initial wxMiniFrame size which used to be tiny 8*8 (and so fixes bug 817832)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:20:10 +00:00
Julian Smart
c360bf5beb Added wxTreeListCtrl: patch [ 883529 ] wxTreeListCltr
Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 13:02:01 +00:00
Julian Smart
0032ddbb32 Misc doc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:45:37 +00:00
Julian Smart
73ff84ff71 Applied patch [ 892608 ] wxLogDialog + wxLogFrame: minor improvement for file saving
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:43:41 +00:00
Julian Smart
dba6b4f880 Applied patch [ 892543 ] wxUniversal: Bitmaps in disabled menu items
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:38:31 +00:00
Stefan Csomor
1a527fbc0a corrected Sleep implementation (as clock() under Mach does only return our own passed time)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:38:11 +00:00
Julian Smart
4dc8d4b7c2 Added CE project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:22:42 +00:00
Julian Smart
798303203d Applied patch [ 875666 ] Warning free configtool util
ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 12:01:28 +00:00
Julian Smart
5a332fb5e0 Applied patch [ 879998 ] Warning free animate contrib
ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:59:34 +00:00
Julian Smart
a20ad557cc Fixed RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:57:59 +00:00
Julian Smart
2b3644c715 Applied patch [ 875663 ] Warning free mmedia contrib
ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:56:22 +00:00
Julian Smart
74de91cc97 Applied [ 880011 ] Several fixes to DbBrowse demo
ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:53:48 +00:00
Julian Smart
2321962672 Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:49:22 +00:00
Stefan Csomor
00f5539438 scroll of subwindow confined to rect param
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:07:23 +00:00
Stefan Csomor
f8e089e0c5 tabs fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:06:06 +00:00
Stefan Csomor
3a05d58d94 corrected line counts and implemented ShowPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 10:56:48 +00:00
Stefan Csomor
5c250a1033 corrections for buffers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 09:53:50 +00:00
Stefan Csomor
305a0f6057 unicode savvy conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 09:52:19 +00:00
Mattia Barbon
56b88f1276 Documented new constructor and overloaded Create methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 08:27:29 +00:00
Mattia Barbon
4901082d7d Update toback24.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 08:24:01 +00:00
Mattia Barbon
e700df04ec Reverses part of my changes of Mon Apr 14 17:27:28 2003. This
fixes wxMotif windows not getting most mouse move events (testcase:
could not drag cards in Forty). This is a quick fix for 2.5.1.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 08:07:10 +00:00
Mattia Barbon
6e94fff95a Compilation fix for wxUSE_STL == 1 and wxUSE_UNICODE == 1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 07:58:15 +00:00
Mattia Barbon
f6afb56a2d Applied patches #892580 and #892582 from Christian Sturmlechner.
Fix of variable declaration in wxApp::Yield().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 07:54:26 +00:00
David Elliott
4858097646 Use wxLogTrace instead of wxLogDebug for trace messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 07:07:04 +00:00
David Elliott
a619fa3f90 Add wxCocoa-specific trace masks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 07:04:09 +00:00
Stefan Csomor
16a761847f font encodings and refresh upon show (after a hide all no update event is sent at least on Panther)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:33:27 +00:00
Stefan Csomor
908d407cf9 font encodings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:27:53 +00:00
Stefan Csomor
fe92914150 font encodings and a first copy implementation wchar_t 32 <-> 16 bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:27:24 +00:00
Stefan Csomor
a9412f8f03 font encoding support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:23:07 +00:00
Stefan Csomor
fef5c55604 conversion warning gcc 3.3 mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:21:18 +00:00
Stefan Csomor
af3aefcf06 font-encodings additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:19:37 +00:00
Stefan Csomor
1d1ed4087d unicode targets cleanup for cw and xcode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:18:44 +00:00
Stefan Csomor
f5210323f7 getting rid of old pragma for CW Pro 9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 06:13:46 +00:00
Stefan Csomor
86deae1ef1 don't let MacIsReallyShown climb over toplevel windows, otherwise tlws with invisible parents are not showing their controls either
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 05:42:00 +00:00
Vadim Zeitlin
3a7d5f7cc3 background colour of a combobox may now be set (bug 805442)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 00:59:23 +00:00
Vadim Zeitlin
d1e44484f7 reset m_frameTool/StatusBar pointers before deleting them (bug 773474)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 23:48:13 +00:00
Vadim Zeitlin
bb655eade9 don't show the accels on the controls if the system is configured to hide them initially (bug 718368)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 23:18:01 +00:00
Vadim Zeitlin
4a6619bb4c added WM_UPDATEUISTATE and related stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 23:15:12 +00:00
Vadim Zeitlin
a66f2f42f5 trying to fix breakage in wxBufferedPaintDC after the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 21:50:39 +00:00
Vadim Zeitlin
818d407ac6 one line fix for a bug with focus switching to the one after next control instead of the next one after a multiline text control and a 15-line comment explaining it (this incidentally fixes bug 658026 and maybe others)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 21:15:42 +00:00
Vadim Zeitlin
8732e03336 no changes (just removed some long unused junk)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 21:07:24 +00:00
Vadim Zeitlin
56b9925b11 fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 709099 and 645323)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 20:48:18 +00:00
Vadim Zeitlin
9a6c9e31b0 added checkbox for testing wxNB_MULTILINE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 20:20:29 +00:00
Vadim Zeitlin
e69683678e don't change the control width when adjusting the height of the drop down list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 19:51:52 +00:00
Vadim Zeitlin
71e57cd650 use new style creation (MSWCreateControl() and MSWGetStyle()); adjust the drop down list height after appending/inserting/deleting items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 19:26:22 +00:00
Vadim Zeitlin
7b28e0ede4 don't give error messages if ws2_32.dll is not available in wxGetHostName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 19:25:05 +00:00
Vadim Zeitlin
76efbc2a09 compilation fix for wxUSE_VALIDATORS == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 19:24:16 +00:00
Vadim Zeitlin
c5fb40a8aa added wxDC::DrawPolyPolygon() (patch 882189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 19:21:51 +00:00
Vadim Zeitlin
d99957b6b0 multiple fixes to wxChoice/wxCombobox height getting/setting (replaces patches 888171, 834099; fixes bug 880590)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 18:42:56 +00:00
Dimitri Schoolwerth
eb630bf1ec Live resizing is OS X only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 18:38:12 +00:00
Stefan Neis
5e01e9bde4 Handle separators in menus correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 17:04:28 +00:00
Vadim Zeitlin
63b9e659ef added wxDC::DrawPolyPolygon() (patch 882189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 16:54:04 +00:00
Vadim Zeitlin
28a4fe4b50 wxBufferedDC changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 16:39:51 +00:00
Vadim Zeitlin
d6af57d4d2 documented wxBuffered[Paint]DC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 16:39:26 +00:00
Vadim Zeitlin
c7a9b22eeb files for LaTeX 2e compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 16:37:49 +00:00
Vadim Zeitlin
1cc8c8b74e made it possible to preserve background when using wxBufferedDC (replaces patch 876263); some refactoring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 16:16:36 +00:00
Vadim Zeitlin
de2ce07c7a made wxFFile a bit more safe: don't crash when Tell() and Length() are called on closed file (patch 811425)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:44:40 +00:00
Vadim Zeitlin
8cf8a85ea8 documeneted Error()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:43:22 +00:00
Vadim Zeitlin
05df0f1bc7 trying to speed up wxExecute(SYNC) -- by adding sleep to it (!) (patch 814478)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:37:47 +00:00
Vadim Zeitlin
1e79049db3 minor cleanup (patch 876248)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:34:13 +00:00
Vadim Zeitlin
25959b956d wxURL implementation using WinInet functions under Win32 (patch 839305)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:28:06 +00:00
Vadim Zeitlin
ba1e9d6ced Digital Mars compilation warnings and Unicode fixes (patch 884587)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:07:08 +00:00
Vadim Zeitlin
b9b1f368fe respect xsrc, ysrc parameters in DoBlit() (patch 733961)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:02:54 +00:00
Vadim Zeitlin
b321fb12ce better leak error reporting using VC CRT (patch 828250)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 14:53:17 +00:00
Vadim Zeitlin
db2c4c715c removed inclusion of malloc.h (part of patch 828250 but makes sense independently of it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 14:47:48 +00:00
Vadim Zeitlin
5205e26b9b show first item added with InsertItem() correctly (part of patch 833247)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 14:31:29 +00:00
Vadim Zeitlin
461dae941d fixes for compiling with more stuff disabled in setup.h (patch 889211)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 14:26:00 +00:00
Vadim Zeitlin
bad79f58af added wsock32.lib (patch 880683)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 14:19:15 +00:00
Vadim Zeitlin
aca6b1d738 added numdlg.h and generic/numdlgg.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 13:57:37 +00:00
Vadim Zeitlin
fc5414a1c6 made wxNumberEntryDialog public; extracted it and wxGetNumberFromUser() in a separate header (patch 882545)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 13:55:49 +00:00
Vadim Zeitlin
7d0bf46a34 consume less CPU while waiting for thread to terminate (patch 883268)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 13:49:18 +00:00
Vadim Zeitlin
811697104b fix for memory leaks (patch 885242)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 13:19:18 +00:00
Vadim Zeitlin
6e76b35d73 added wxDC::DrawPolyPolygon() (patch 882189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 13:12:31 +00:00
Vadim Zeitlin
77e7c55642 replaced ASSERT in wxEvtHandler::ProcessPendingEvents() with a CHECK (replaces patch 886852)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 12:54:29 +00:00
Vadim Zeitlin
386d53dc2e trying to make comments readable again after their auto-mangling by RN...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 12:51:44 +00:00
Vadim Zeitlin
8dbb97958a fixed wxIsctrl/wxIscntrl confusion (modified patch 888519)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 12:46:14 +00:00
Vadim Zeitlin
fbad77ca73 fixed the mess (nested C/C++ comments) intorduced by automatic comments conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 12:41:39 +00:00
Stefan Csomor
9e68745562 adding textencoding for classic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 08:02:40 +00:00
Robin Dunn
6fa9e4614d Put the wxMemoryBuffer typemaps back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 00:47:53 +00:00
Robin Dunn
83486d3b5a Corrected parameter names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 22:19:02 +00:00
Robin Dunn
5a311edb0c Problem fixed, removed comments about it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 22:18:40 +00:00
Robin Dunn
96b3fa7c71 stc module updates for the new Scintilla
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 22:15:41 +00:00
Robin Dunn
c2e6d97098 Fix wxArrayString and wxArrayInt typemaps so they can be used with
default args.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 22:15:00 +00:00
Robin Dunn
7f8f0b88b7 Use Bind
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 22:14:22 +00:00
Robin Dunn
5f9eb69c1c correct some compile warnings and errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 20:37:57 +00:00
Stefan Csomor
d5f7923b9e fixing notebook icons for panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 18:26:52 +00:00
Robin Dunn
e411268c8c Start out with the line numbers not shown.
Don't use the default size for the AppFrame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 17:36:28 +00:00
Stefan Csomor
d66c3960d5 conditional compilation for compositing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 16:24:52 +00:00
Stefan Csomor
d40f860378 correcting a missing redraw area on certain resize operations when window has a border
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 13:20:02 +00:00
Stefan Csomor
89b1446463 reverting part of Kevin O's patch, due to incompatibility problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 09:10:58 +00:00
Robin Dunn
92dda0f7a3 Call Finalise.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 05:54:16 +00:00
Robin Dunn
0a57b54b8e rebaked the wxSTC makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 05:16:09 +00:00
Robin Dunn
7cb1b9a91c Correct export declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 00:29:56 +00:00
Robin Dunn
8e54aaedb5 Updated Scintilla to version 1.58
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 00:03:13 +00:00
Václav Slavík
1c53456fc9 wxMGL fixes (patch #884758)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 23:13:30 +00:00
Václav Slavík
078c7a596d makefiles update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 22:34:18 +00:00
Václav Slavík
1dce6f094a applied patch 744616: WXRC extension for automated use (Eduardo Marques)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 21:58:29 +00:00
Vadim Zeitlin
00233716e4 don't call Init() twice when dialog is created in 2 steps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 20:51:33 +00:00
Václav Slavík
4b97309acc moved wxClientData to wxcore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 19:57:57 +00:00
Vadim Zeitlin
f08bc7840e removed wxTE_HT_XXX constants which are now in wx/textctrl.h itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 19:44:58 +00:00
Václav Slavík
2d4957f240 restored wxPluginLibrary::ms_classes handling code that was removed by mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 10:38:01 +00:00
Robin Dunn
02a34c4c56 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 01:12:26 +00:00
Robin Dunn
e8e4a2a4d4 Some ifdef's to correct compile problems on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 01:04:08 +00:00
Robin Dunn
7e4a196e34 Don't send the wxWindowCreateEvent immediately
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 00:25:36 +00:00
Robin Dunn
4e760a36f0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 00:24:27 +00:00
Robin Dunn
4d5c3d9119 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:41:34 +00:00
Robin Dunn
8eda5e3588 Other little docs tweaks, and added HTML versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:39:15 +00:00
Robin Dunn
c8000995b5 You can now make menu items without IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:38:38 +00:00
Robin Dunn
67aaa6080a Don't use a default button.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:37:35 +00:00
Robin Dunn
1e53cf51f6 wxTextCtrl::HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:36:58 +00:00
Robin Dunn
e07fb96db5 Added bool typemap so Py_True and Py_False are returned instead of integers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:36:07 +00:00
Robin Dunn
e0dd12db99 Using a -1 (wxID_ANY) for menu or toolbar item IDs will now generate a
new ID for the item using wxNewId().  As a consequence of this, the
value of wxID_SEPARATOR was changed from -1 to -2 in order to not
clash.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:28:11 +00:00
Robin Dunn
5a60a58a73 fix for SEARCH_LIB so libs can still be found in the non-lib64 locations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 20:04:15 +00:00
Václav Slavík
2ece66cf55 autoconf_inc.m4 was corrupted as well, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 19:58:46 +00:00
Václav Slavík
e3a630bb68 fixed bug #890430, parameter documented twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 19:39:35 +00:00
Vadim Zeitlin
402b0a2c22 updated with the latest sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 18:05:43 +00:00
Julian Smart
1d95f44a12 2.5.1, not 2.5.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 17:06:00 +00:00
Vadim Zeitlin
efe66bbc0e added wxTextCtrl::HitTest(); implemented it for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 14:56:14 +00:00
Julian Smart
3e27ea5908 Reverted last change (use of regex) that broke eVC4 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 12:26:20 +00:00
Vadim Zeitlin
789c5f4a8d look for Motif 2.1 headers before Motif 1.2 ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 10:21:58 +00:00
Vadim Zeitlin
cb025c0c86 look for libs under /usr/lib64 and /usr/X11R6/lib64 (needed for some Linux distributions on AMD64 )
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 10:11:02 +00:00
Václav Slavík
00f6001fa5 blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 09:40:17 +00:00
Robin Dunn
a729c34475 Updated note about wxWANTS_CHARS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 02:01:24 +00:00
Robin Dunn
6afa47d63d Also allow key events for Shift-Tab when wxWANTS_CHARS style is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 02:00:48 +00:00
Robin Dunn
4c8347a5ab Decorator classes are no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 23:36:49 +00:00
Robin Dunn
ba933fa510 Added a typecheck typmap for wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 03:58:36 +00:00
Robin Dunn
78862f240c wxWave --> wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 03:55:05 +00:00
Robin Dunn
65cf3a4b6a Added export decl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 03:43:49 +00:00
Robin Dunn
699e192bcc Take advantage of the new ctors accepting a wxArrayString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 00:11:31 +00:00
Robin Dunn
b4e7f826af Use a compatible bitmap if a depth of -1 is given
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-03 00:08:53 +00:00
David Elliott
079cc3b670 * GetValue() now returns true if the state is undetermined
* Commented out some assertions that are handled in the base class


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 23:09:40 +00:00
Dimitri Schoolwerth
d8910e4579 Updated (c)-year to 2004.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 20:22:23 +00:00
Václav Slavík
010b8f7093 configure got corrupted somehow, regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 16:19:36 +00:00
Václav Slavík
dcb206ade4 documented new API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 14:35:56 +00:00
Václav Slavík
002ed9af83 renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 14:34:35 +00:00
Václav Slavík
4a3990e259 wxWave->wxSound, Unix wxSound improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 14:13:24 +00:00
Václav Slavík
dff1fa9bf5 renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 14:12:12 +00:00
Václav Slavík
315ebf688c renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:42:04 +00:00
Václav Slavík
f156e20c8e renamed wxWave to wxSound; compatibility fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:34:35 +00:00
Václav Slavík
321b8029b3 hopefully better description of GetSocketGUIFunctionsTable's purpose
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:26:59 +00:00
Václav Slavík
cad1a197e5 renamed wxWave to wxSound; compatibility fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:16:31 +00:00
Václav Slavík
bae90c4cd5 renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:15:51 +00:00
Václav Slavík
d93966b92a renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 13:03:23 +00:00
Václav Slavík
3aefa658c8 fool proof fix for gcc warnings on mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 11:32:55 +00:00
Václav Slavík
9bb15269a7 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 11:23:27 +00:00
Vadim Zeitlin
ed79306972 removed obsolete wxToLower/Upper() documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 11:03:30 +00:00
David Elliott
7f7b69e220 Applied modified 3-state checkbox patch from Mathew Cucuzella
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 04:58:16 +00:00
Václav Slavík
9111634545 fixed flags to make and tests easier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 00:50:11 +00:00
Václav Slavík
83f7f12df2 API and code changes to allowing stopping playback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 00:49:39 +00:00
Václav Slavík
98840d95db oops, more fixes needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 00:02:03 +00:00
Václav Slavík
342dc9287c don't release audio after the sound finishes playing, it ruins GUI responsivity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 23:33:18 +00:00
Václav Slavík
64f4500a4a don't queue sounds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 23:10:02 +00:00
Václav Slavík
cb9548d9a7 removed duplicated code and really fixed setup.h problems in regex.lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 22:41:33 +00:00
Václav Slavík
cb979facf3 use x.y.z version in unstable branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:54:39 +00:00
Václav Slavík
c79241a238 changes to make building plugins possible; build wxSound SDL plugin on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:31:54 +00:00
Václav Slavík
f93ca9fd7e 1. optionally use libSDL for wxSound
2. added --enable-plugins for dynamically loadable SDL backend
3. fixed OSS detection to not be Linux specific


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:29:49 +00:00
Václav Slavík
e9e23cb531 renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:27:25 +00:00
Václav Slavík
9be32e8f2d added support for async playback to Unix implementation of wxSound, implemented SDL backend for playback if OSS is not available, fixed OSS to work on non-Linux Unices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:25:12 +00:00
Stefan Neis
41c54face1 Fixed typo in MBN's extensions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 16:52:11 +00:00
Václav Slavík
21d93bcea5 don't forget to update distrib scripts as I did
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 14:02:37 +00:00
Julian Smart
816c1e8071 Updated scripts for new sound sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 13:24:47 +00:00
Ryan Norton
3bde165cd0 Fixed setup.h logic again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 12:30:37 +00:00
Ryan Norton
d8d21537bd Fix for [ 877037 ] It is no longer possible to build using wxWindows.dsw
Fixed setup.h logic


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 12:27:47 +00:00
Ryan Norton
1ec597c015 added back $id
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 12:19:07 +00:00
Ryan Norton
2acf1768a6 Added setup.h logic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 12:17:15 +00:00
Václav Slavík
0d9c603db6 added wxWave sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 10:53:59 +00:00
Václav Slavík
518cdeacb2 minor updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 10:52:30 +00:00
Václav Slavík
9ea7b86fc8 prefix symbols with wx, for smaller risk of collision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 10:48:30 +00:00
Václav Slavík
8bcf4c86f4 use at most -O1 with BCC, it is broken and cannot correctly compile this file with -O2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 10:40:47 +00:00
Dimitri Schoolwerth
594ed110f7 Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when running in wxUniv release mode using BCC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 08:49:56 +00:00
David Elliott
5c526007a8 Assert that m_pendingEvents is not NULL (patch #886852 sort of)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 01:55:41 +00:00
Mattia Barbon
1a81dc1255 Compilation fix for !WXWIN_COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 18:23:50 +00:00
Mattia Barbon
584ad2a32f Added some missing STL-like wxArray/wxArrayString constructors.
Added helper class wxCArrayString, better replacement for
wxArrayString::GetStringArray.
  Added overloaded constructors and Create() methods taking
a wxArrayString for wxCheckListBox, wxChoice, wxComboBox,
wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 18:21:45 +00:00
Stefan Neis
55945915c9 Reordered includes to have OS2EMX_PLAIN_CHAR defined prior to including os2.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 17:47:53 +00:00
Václav Slavík
d298092120 wxClassInfo (un)registration now happens automatically, no need to do it in wxPluginLibrary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 16:37:04 +00:00
Václav Slavík
8d65a2e1f8 fixed wxFSVolume definition if !wxUSE_GUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:49:51 +00:00
Mattia Barbon
df7f0a04ba Fixed idle event processing in wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:45:30 +00:00
Václav Slavík
ae54422d9d cleanup: all definitions missing from std headers should be in missing.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:44:46 +00:00
Václav Slavík
2a5f8668e8 wxUSE_STL affect binary compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:32:30 +00:00
Julian Smart
e917b59561 Removed remaining DialogEd files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:13:46 +00:00
Julian Smart
1cb1484131 Removed DialogEd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 14:03:31 +00:00
Stefan Neis
6d63b0946b Fixed variable name mismatch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 12:49:12 +00:00
Stefan Neis
1d4f9cb74d Fixed compile error with gcc-3.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 12:44:47 +00:00
Stefan Neis
edb8604f18 Fixed compile error.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 12:41:32 +00:00
Robin Dunn
8edf1c75f0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 03:29:15 +00:00
Robin Dunn
a333120784 Fixed a compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 03:23:11 +00:00
Robin Dunn
f904231a06 Fix compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 02:56:02 +00:00
Robin Dunn
994141e6cd reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:48:55 +00:00
Robin Dunn
faadde7e06 %addtofunc --> %pythonAppend
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:45:47 +00:00
Robin Dunn
0d6ff08218 A few comments tweaked
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:19:44 +00:00
Robin Dunn
2b9048c56f %addtofunc --> %pythonAppend
Also used %pythonPrepend to provide backwards compatibility for a few
parameter name changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:18:37 +00:00
Robin Dunn
d7f8258414 Updated SWIG runtime code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:13:31 +00:00
Robin Dunn
0cb6df6e3d Updated SWIG patches to CWIG CVS 20040130.
Added a new patch that changes addtofunc to pythonAppend and adds pythonPrepend.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 01:11:51 +00:00
Václav Slavík
8a942c3dd3 (blind) fix for gcc warning on some platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-30 12:57:51 +00:00
Václav Slavík
e9b964cfe5 prefix symbols with wx_ to reduce risk of collision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-30 12:20:40 +00:00
Václav Slavík
1481b2adb2 reverted rev 1.113
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-30 11:25:18 +00:00
Dimitri Schoolwerth
d301b8a247 Applied most of patch #880002: "Warning free plot contrib".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 23:30:21 +00:00
Dimitri Schoolwerth
cd6754a184 Applied patch #880008: "Unused parameters in FL contrib reported by VC".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 23:11:29 +00:00
Dimitri Schoolwerth
fd04b3cb95 Fixed a few typos.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 21:33:45 +00:00
Ryan Norton
19f0995a78 added newline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 09:44:34 +00:00
Stefan Csomor
8f9c25cc86 xcode native target adaption
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 09:43:18 +00:00
Ryan Norton
9f5b78b7a2 Bad newlines in the mpw makefile,
so it is removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 08:19:49 +00:00
David Elliott
d23193b224 Use wxBitmap::GetNSImage(false) instead of duplicating code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 06:34:26 +00:00
David Elliott
f8c10ed8b3 ConvertToImage: Check !Ok() (we may not have any ref data at all) and if
the bitmap is not okay return wxNullImage (instead of a dummy 5x5 image)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 06:26:10 +00:00
David Elliott
7bb70733bb wxCocoa: Don't use listbox for logging until it's more fully implemented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 06:21:59 +00:00
Ryan Norton
914df545ff Makefile for MPW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 01:43:48 +00:00
Dimitri Schoolwerth
4d073429a0 Applied patch #886192: "Minor fix to XRC contrib"; Minor cosmetic cleanups.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-28 14:41:59 +00:00
Dimitri Schoolwerth
51d78461fa Applied remainder of patch #876969: "Fixes to Borland warnings".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-28 11:17:02 +00:00
Dimitri Schoolwerth
e9d2bb6f72 Applied patch #875658: "Fixes to console sample"; Further code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-28 00:29:07 +00:00
Robin Dunn
a9092ede82 Send an extra size event after creation to work around an apparent bug
in XP's ListView_GetViewRect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 22:56:08 +00:00
Dimitri Schoolwerth
d1b20379e4 Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 22:30:13 +00:00
Julian Smart
8cc4850c2d Patch from "Viktor Voroshylo" <viktor@voroshylo.com>
src/.cvsignore : changes to ignore temorary project files
src/regex/.cvsignore : changes to ignore temorary project files for CE compiler
src/regex/regguts.h : assert will be ignored under WinCE
src/msw/button.cpp : BS_FLAT is not available under winCE
src/msw/clipbrd.cpp : changed CLIPFORMAT to wxDataFormat::NativeFormat so it will compile when ole is not included (under winCE)
src/msw/menu.cpp : GetMenuItemCount is not available under winCE. Using wxMenu::GetMenuCount in this case
src/common/regex.cpp : regex will be included under wince
include/wx/msw/wince/setup.h : wxUSE_THREADS & wxUSE_REGEX is enabled by default (as in standard windows configuration)
src/msw/wince/wxWindowsCE.vcp: fixed problem with all configurations (except emu once) do not have procompiled headers setup correctly. Changes for compiling with regex.
src/msw/wince/wxWindowsCE.vcw : added regex in workspace file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 17:47:37 +00:00
David Elliott
b5df4fc722 wxCocoa: Better icon support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 06:01:34 +00:00
Robin Dunn
58203fa6b8 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 02:38:53 +00:00
Robin Dunn
700c96d420 docstring patch has been submitted to SF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 02:35:25 +00:00
Robin Dunn
5d895c0bcd Get[First|Next]Child need to actually create a new itemid if we want
the proxy to own it.

Also switch to just "void*" instead of the typedef to avoid confusing swig.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 02:30:05 +00:00
David Elliott
c15ffb3bf5 wxCocoa: Add some header files to the COCOA_HDR list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 01:49:23 +00:00
Robin Dunn
45da8bb7c7 Use the DISOWN typemap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 01:00:54 +00:00
Robin Dunn
8668c24280 Use the DISOWN typemap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 00:52:47 +00:00
David Elliott
7b466aee08 Moved @interface wxNSApplicationDelegate to new header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 00:50:57 +00:00
Robin Dunn
2659dad320 wxMac needs the scroll styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:59:38 +00:00
Robin Dunn
887dfc146f Remove all extensions before inport, not just .py
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:45:58 +00:00
Robin Dunn
93b663b8cc Fix incorrect #if in OnSysTell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:45:21 +00:00
Robin Dunn
ae5343ecfd Make SWIG copy the GetDate return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:44:38 +00:00
Robin Dunn
ae18f6104c Use correct name for event type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:43:39 +00:00
Václav Slavík
31caa11b19 run bakefile_gen in this directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:11:40 +00:00
Václav Slavík
1be21a1f21 clarified that bakefile_gen is the tool to use, not bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 22:09:43 +00:00
Václav Slavík
2091e2a0b3 another libtiff fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 21:32:07 +00:00
Julian Smart
c45b7e75d1 Added RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 20:01:30 +00:00
Václav Slavík
19c2503357 renamed system option to better match existing ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 13:19:31 +00:00
Václav Slavík
6bda7391c1 don't include GetShortcutTarget if OLE is not available; removed fake noop implementation from WinCE, it's better to let the user know it doesn't work by not providing it in the first place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 12:53:39 +00:00
Václav Slavík
ff95fdbb31 don't include GetShortcutTarget if OLE is not available; removed fake noop implementation from WinCE, it's better to let the user know it doesn't work by not providing it in the first place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 12:44:14 +00:00
Václav Slavík
f95e449508 wxBase uses OLE, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 12:42:43 +00:00
Václav Slavík
c0d26c0f18 fixed syntax errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 10:40:53 +00:00
Václav Slavík
1e6afae84c documented wxMGL's system options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-26 10:39:26 +00:00
Patrick K. O'Brien
e757654cd8 Minor cleanup for 2.5. Upped version to 0.9.4. Removed use of decorators.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 23:37:41 +00:00
Stefan Csomor
1c32ded32c reopen app apple event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:17:48 +00:00
Stefan Csomor
1f90939c20 compositing and transition changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:17:20 +00:00
Stefan Csomor
f17e0be479 mozilla fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:16:45 +00:00
Stefan Csomor
11d1adbfda rendering adjustments for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:15:12 +00:00
Stefan Csomor
5d8fbe213c panther adjustements in size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:13:45 +00:00
Stefan Csomor
1ed1a60984 Ryan's display extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:12:43 +00:00
Stefan Csomor
5974c3cf06 extensions management unified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:12:02 +00:00
Stefan Csomor
66b7ea46c7 compositing and transtion changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:09:59 +00:00
Stefan Csomor
2d2b3db101 reopen application
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 15:08:35 +00:00
Stefan Neis
3665f7d07e Compute update rectangle only when needed [i.e. if (!m_grid->GetBatchCount())]
[Patch 882656]


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 14:26:06 +00:00
Ryan Norton
59f098d159 Remove taskbar support for now on OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 08:46:00 +00:00
Mattia Barbon
50b079e598 Cleaner fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 08:33:57 +00:00
Václav Slavík
00d90a911f compilation fix for libtiff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-25 00:34:38 +00:00
Václav Slavík
9650797667 fix for libtiff compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-24 22:13:28 +00:00
Dimitri Schoolwerth
a265d21aad Renamed PATPAINT to PATTERNPAINT (The former is an existing define in wingdi.h); Cosmetic code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-24 21:16:59 +00:00
David Elliott
b92ca05a69 Baked bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-24 06:22:55 +00:00
Robin Dunn
83448d7147 reSWIGged for new runtime, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:52:06 +00:00
Robin Dunn
41378d3480 Upadted GLCanvas demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:49:04 +00:00
Robin Dunn
6ab5b2e6e0 Use correct name for alternate constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:48:15 +00:00
Robin Dunn
2dbef2723c reSWIGged with new runtime, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:40:41 +00:00
Robin Dunn
689b5c3869 Put a copy of the generated C++ docs back into the docs tree
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:11:26 +00:00
Vadim Zeitlin
2b2685355f just clarified an incorrect comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 22:06:37 +00:00
Robin Dunn
a41e16b636 reSWIGged with the new SWIG runtime and also other recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:58:14 +00:00
Robin Dunn
8b79f98329 Fix MSVC 6 compile problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:28:55 +00:00
Robin Dunn
c12014018b Fixed another SWIG warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:26:34 +00:00
Robin Dunn
2370fd3a74 Typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:11:27 +00:00
Robin Dunn
addd64eea4 Cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:10:42 +00:00
Robin Dunn
76e4fb5ef9 wxGTK has SetSelection now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:09:45 +00:00
Robin Dunn
b60e45d16a docstring fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:08:43 +00:00
Robin Dunn
9cca52ba2b More encoding constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:07:50 +00:00
Robin Dunn
814cbb494a Fixed SWIG warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:06:42 +00:00
Robin Dunn
383562174e wxMenu::Append (and similar) now return a pointer to the wxMenuItem
that was added.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:03:15 +00:00
Robin Dunn
fe4a107dda wxMenu::Append (and similar) now return a pointer to the wxMenuItem
that was added.  Checked on MSW, GTK, and Mac, other port authors
please double check changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:02:06 +00:00
Robin Dunn
1ba7e7b79f Fixed compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 21:00:40 +00:00
Robin Dunn
9add93670b wxMenu::Append (and similar) now return a pointer to the wxMenuItem
that was added.  Checked on MSW, GTK, and Mac, other port authors
please double check changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 18:46:05 +00:00
Ryan Norton
2f3f436922 Check for WCHAR_T (thanks to ABX for pointing this out)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 18:42:41 +00:00
Julian Smart
b0fb0f3c71 Applied patch [ 882493 ] Added XRC support for wxStatusBar
By Brian Ravnsgaard Riis


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 10:01:44 +00:00
Ryan Norton
32c479fdf1 OS X Dock Menu/Taskbar support (not added to bakefiles yet - preliminary)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 09:52:18 +00:00
Ryan Norton
7f71c4c8d3 HID support (preliminary - not added to bakefiles yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 09:44:05 +00:00
Robin Dunn
2fd4848088 Fixed a "comparison is always false" warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 02:44:42 +00:00
Robin Dunn
e50d5284f9 Moved wxMacGetSystemEncFromFontEnc and wxMacGetFontEncFromSystemEnc to
a module that is included in wxBase to prevent linking errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 02:43:29 +00:00
Dimitri Schoolwerth
0ebb0e5c84 Fixed DDE memory leaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 02:30:00 +00:00
Robin Dunn
3d3e0170c0 Fixed autodoc for static methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 00:12:34 +00:00
Robin Dunn
226b64025a ensure that SetDimensions params are ints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 00:00:13 +00:00
Robin Dunn
09557ac6d1 build static lib and then use it for building wxrc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:59:05 +00:00
Robin Dunn
fa72af694e Batch file for building the wxWindows .chm help file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:57:50 +00:00
Robin Dunn
1b499eb38e Don't forget wxrc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:57:09 +00:00
Robin Dunn
108db18a79 Stop the timer when the demo is shutdown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:56:39 +00:00
Robin Dunn
f12166fcf5 use Bind
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:56:00 +00:00
Robin Dunn
2461468b51 Add some missing wx. prefixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:27:39 +00:00
Robin Dunn
305ac48f0a take Throbber out of Misc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:27:14 +00:00
Robin Dunn
7cc2d290b4 wx.App
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:26:34 +00:00
Robin Dunn
5c75d209da add an overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 23:25:09 +00:00
Robin Dunn
b978d7aa08 These files just changed in SWIG again, so update the patches again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 22:55:38 +00:00
Robin Dunn
1de47c7cb4 Updated SWIG patches and wxPython's SWIG runtime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 22:31:34 +00:00
Václav Slavík
e20e6988ac fixed wrong handling of magenta (patch #882201)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 21:15:30 +00:00
Stefan Csomor
c83e123712 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 20:09:31 +00:00
Václav Slavík
a2d452d042 fixed wrong handling of magenta (patch #882201)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 20:05:34 +00:00
Stefan Csomor
25b1b5668e font encoding support added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:53:46 +00:00
Stefan Csomor
d9d19e7545 setting the default locale during startup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:52:11 +00:00
Stefan Csomor
8057c6d68f moved system-fontencoding conversions to fontutil.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:41:58 +00:00
Stefan Csomor
3af5821cf9 mac encodings support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:40:04 +00:00
Stefan Csomor
ec79aded14 systen encoding for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:38:40 +00:00
Stefan Csomor
34c2c1a1d9 font and system conversion functions for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:36:06 +00:00
Stefan Csomor
3f56b20ea9 added all standard mac encodings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 18:32:50 +00:00
Vadim Zeitlin
f8f9ec5563 implemented SetSelection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 15:20:34 +00:00
Vadim Zeitlin
8282369a53 preselect the text in the dialog to allow replacing it easier (just as in the text entry dialog)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 15:09:08 +00:00
Vadim Zeitlin
279b5e2ece implemented HitTest() (modified patch 875957)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 14:47:19 +00:00
Vadim Zeitlin
b870b105ae fix what seems to be a big memory leaks in SetPageImage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 14:39:29 +00:00
Vadim Zeitlin
1312d8f6e0 German translations update from Martin Jost (patch 875687)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 14:09:19 +00:00
Vadim Zeitlin
cbcf084b05 minimal changes needed to allow linking wxCocoa as shared lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 13:35:08 +00:00
Vadim Zeitlin
b919fd4778 replaced (references to) LastError() with GetLastError() (bug 878525)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 12:53:04 +00:00
Vadim Zeitlin
211436b6f4 use wxColourDatabase::Find(), not obsolete FindColour(), in wxColour::InitFromName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 12:16:04 +00:00
Vadim Zeitlin
e9cece45b9 suppress warnings about implicit float -> int conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:55:03 +00:00
Vadim Zeitlin
c041438d3f warning about returning something from a void function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:53:29 +00:00
Vadim Zeitlin
2108cc974f suppress warnings about implicit double -> int conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:52:34 +00:00
Vadim Zeitlin
e7a74e8f28 compilation fix for !wxUSE_VALIDATOR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:34:15 +00:00
Vadim Zeitlin
2ac400737a linking fix for wxCocoa apps using clipboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:28:44 +00:00
Vadim Zeitlin
09d3439cc2 fix for wx-config --inplace --rezflags output in wxCocoa (and reorganization of code common to wxMac/wxCocoa)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:28:06 +00:00
Vadim Zeitlin
af77752fc0 don't crash when restoring focus after showing a modal dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:26:20 +00:00
Vadim Zeitlin
368ba124ef make it possible to restart timer with a simple Start(), as in other ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:26:15 +00:00
Vadim Zeitlin
c944ce3573 fixed compilation when wxUSE_THREADS == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:26:10 +00:00
Václav Slavík
395a1c56f9 let <wx-lib>odbc</wx-lib> do nothing if USE_ODBC=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 09:01:33 +00:00
Václav Slavík
bfca95348b bcc has ODBC symbols in odbc32.lib, not import32.lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 08:56:24 +00:00
David Elliott
b0c0a393c4 Unicode build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 07:29:54 +00:00
David Elliott
9e888492a6 * Add Unicode support for wxNSStringWithWxString and wxInitNSStringWithWxString
* Add wxStringWithNSString which works for both WC and MB builds


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 06:18:06 +00:00
David Elliott
2b030203c5 Applied patch #881258: Add wxT() to debug messages and a few others
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 06:13:51 +00:00
David Elliott
f910a887bb Applied correct filename case for header imports from patch #881258
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 04:41:34 +00:00
David Elliott
b17c174693 Baked files with Bakefile 0.1.2 (Mac OS 10.3 Python 2.3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 03:48:09 +00:00
Robin Dunn
d1a6e2b7a1 Typos fixed and further clarification of the Python situation on Panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 23:05:25 +00:00
Robin Dunn
c6387bc1c5 Changes needed to put the Panther version in the right place, also
changed to using "panther" and "jaguar" in the names.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 20:53:39 +00:00
Robin Dunn
b515af7a75 Typos fixed and other tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 20:33:57 +00:00
Václav Slavík
0b556b005e fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 17:59:39 +00:00
Václav Slavík
8998a324a5 disable multilib by default for Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 17:52:49 +00:00
Julian Smart
a9b293667e wxFileDialog now returns correct filter index for multiple-file
dialogs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 13:44:54 +00:00
Julian Smart
f0f4301209 Filter index wasn't being set for multiple file dialog
Added several filters to multiple files test in dialogs sample
to test that it's now working


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 13:41:12 +00:00
Robin Dunn
c10ae51018 Use Bind
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 03:06:55 +00:00
Robin Dunn
f0cd63d2af new encoding constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 02:15:31 +00:00
Robin Dunn
49234978d5 Fix cleanup exceptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 01:50:22 +00:00
Robin Dunn
60d8ee3953 cleanup, docs, and typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-21 01:48:24 +00:00
Robin Dunn
b701254ac2 Use new SystemSettings names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 23:31:20 +00:00
Robin Dunn
138bb8ca69 use new syntax for emitting python code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 23:30:54 +00:00
Robin Dunn
e6a5dac664 typos fixed and more notes on some changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 23:29:16 +00:00
Robin Dunn
a55bea574a Be sure to mention the directories too so they get cleaned up upon uninstall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 23:28:37 +00:00
Robin Dunn
317d155040 Patches from Tomo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 23:26:57 +00:00
Stefan Csomor
90548138ac preliminary fix, for using the correct output encoding on mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 22:01:43 +00:00
Stefan Csomor
788a28b4f8 added mac conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 21:59:11 +00:00
Stefan Csomor
71111c40eb wchar_t (4 bytes) / unichar (2 bytes) problems first attempt to fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:22:46 +00:00
Stefan Csomor
335d31e007 string conversion implemented for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:20:44 +00:00
Stefan Csomor
a380af4dbf ambiguous operator[] access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:19:55 +00:00
Stefan Csomor
c54b92d363 system includes instead of user
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:18:48 +00:00
Stefan Csomor
008c46add5 gcc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:17:48 +00:00
Stefan Csomor
1770b024b7 turn off unknown pragma for CW 9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:14:08 +00:00
Dimitri Schoolwerth
aa2863ef8b Removed obsolete file and added 2 new required ones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:03:18 +00:00
Dimitri Schoolwerth
c5dbbb800c Added ../../include/wx/ to path.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:01:49 +00:00
Chris Elliott
2a78ba63c1 fix for DMC missing mouse defines - linking of minimal failed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 09:01:11 +00:00
David Elliott
3d27b5746f When inserting a new menu don't try to find th eposition of the current one
if the menubar is not yet attached.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 02:57:06 +00:00
Ryan Norton
b8f896a10a - Got rid of warnings
- Fixed locale problems (?)
- Fixed newlines of rege_dfa.c


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 22:11:48 +00:00
Julian Smart
2cfddfe7ca Sometimes the clipping region can become bigger than the
actual window, and this can cause X11 to fail inside gdk_gc_set_clip_region
intermittently. The clipping region is now limited to the actual
window size so only valid regions can be passed to this function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 21:35:17 +00:00
David Elliott
758f1d2e02 Reverting wxAppTraits GSocket patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 18:40:45 +00:00
Chris Elliott
446ea10731 fix for DMC missing mouse defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 16:41:08 +00:00
Chris Elliott
8d8b257c4e fix for DMC missing TVS_INFOTIP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 15:54:05 +00:00
Julian Smart
d3e78bab3e Some doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 14:39:11 +00:00
Dimitri Schoolwerth
2673bcb00d Applied patch #876800: "Alphabetical order of tabs in widgets sample".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 13:27:24 +00:00
Václav Slavík
f101c18df6 supressing legitimate warnings was bad idea, reverting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 10:30:38 +00:00
Julian Smart
cde47db3d8 Added back constructor implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 08:15:35 +00:00
David Elliott
69ada15b30 Baked files with Bakefile 0.1.1 using Python 2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 06:16:56 +00:00
David Elliott
05a019a2a8 Copied gsockpm.c revision 1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 22:43:55 +00:00
David Elliott
b7ceceb186 Copied gsockmsw.c revision 1.20
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 22:42:07 +00:00
Julian Smart
3af1a9f821 encinfo.h was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 22:04:00 +00:00
David Elliott
793ba541b6 Copied gsockmot.c revision 1.7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 22:00:00 +00:00
David Elliott
1d17f92389 Removed this file since it was only stubs and we now have the common
Mac OS X implementation in src/mac/gsockosx.c(pp)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:57:52 +00:00
David Elliott
bf703528c2 Copied gsockx11.c revision 1.7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:55:10 +00:00
David Elliott
02dad85e87 Copied gsockosx.c revision 1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:51:53 +00:00
David Elliott
180f971462 Copied gsockgtk.c revision 1.16
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:45:53 +00:00
David Elliott
5c2896013b * Add my name to authors as the new maintainer.
* Include wxWindows header files in the standard manner.
* Use the new wxAppTraits::CreateGSocket() method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:39:17 +00:00
David Elliott
49bcad6219 Added wxAppTraits::CreateGSocket() as well as implementations for wxBase and
wxGUI.  This method should return a new derived instance of GSocketBSD which
implements the EventLoop_ pure virtual functions appropriately.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 21:35:00 +00:00
David Elliott
1119a830a8 Move GSocketBSDGUIShim from source file to header (we'll need it in a second)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 20:17:29 +00:00
David Elliott
444cb1fdcb Add virtual methods to GSocketBSD for calling the event loop handler
instead of the GUI event functions table.  Also added a compatibility class
to gsocket.cpp until we can update all of the GUIs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 19:34:16 +00:00
Julian Smart
2a9d84d006 Removed dialoged, regex/tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 14:20:41 +00:00
Václav Slavík
bf94841aaa supress warnings in regex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 10:03:09 +00:00
Julian Smart
71098d1242 Don't copy obsolete Dialog Editor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 08:40:09 +00:00
Julian Smart
60567f020f regex doesn't have tests directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 08:29:45 +00:00
David Elliott
09e6e5ec02 Initial move from C to C++. The functionality of the code should not have
changed at all in this move from C to C++.  To top that off there is a
define wxUSE_GSOCKET_CPLUSPLUS in include/wx/gsocket.h which turns off
all the new code in that file and also gsockunx.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 07:46:18 +00:00
Robin Dunn
1c01bc8e05 Ignore the args and args errors on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 03:38:34 +00:00
Robin Dunn
b8628a0e2e *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 03:37:53 +00:00
Robin Dunn
289128a4fb Don't create the fonts until after they are needed (after the App
object has been created.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 03:05:02 +00:00
Robin Dunn
7a72b62e43 Change owner and permissions of installed files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 01:42:51 +00:00
Robin Dunn
ded0b5ce65 updates for the readme
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 00:15:39 +00:00
Robin Dunn
6b484aa0bc Updated preview version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 00:14:50 +00:00
Robin Dunn
978cadd05f RPM tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-18 00:13:51 +00:00
Václav Slavík
548d77c789 console sample contains wxDb tests, it must link against wxodbc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 23:49:44 +00:00
Robin Dunn
46456f618c Updated Installer builder scripts and such for OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 23:20:49 +00:00
Mattia Barbon
9ee7c8d670 Compilation fix for MSVC 6 and wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:34:51 +00:00
Mattia Barbon
a6c7a0f826 MinGW compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:21:48 +00:00
Mattia Barbon
25e4b4bfde Correct wxPerl note.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:18:56 +00:00
David Elliott
97e6ee0454 Copied gsocket.c revision 1.80
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:17:58 +00:00
Mattia Barbon
4f44ea367d Add wxRTTI information.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:16:56 +00:00
Mattia Barbon
e94e2e952b Handle client data correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:14:38 +00:00
David Elliott
990ef031fd Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 21:49:47 +00:00
Julian Smart
51f8b24631 Applied [ 876737 ] menu item with bitmap uses wrong font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 17:05:35 +00:00
Robin Dunn
1ab1deabc7 also cleanup patch reject files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 19:32:32 +00:00
Robin Dunn
0d58d62689 Ensure item is valid before using it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 19:25:11 +00:00
Robin Dunn
cff531b1a8 Updated metadata document
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 06:01:51 +00:00
Ryan Norton
4cc33fd8ce Removed bogus configuration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 03:45:22 +00:00
Ryan Norton
a060c2abc5 Added setup.h stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 03:43:33 +00:00
Robin Dunn
852b118501 Send menu highlight events and fix statusbar to update immediatly when
status text is changed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 01:48:53 +00:00
Robin Dunn
3dfafdb9e6 Send window create events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 01:46:18 +00:00
Robin Dunn
657dbfccd6 Patch [ 877891 ] Share the DC from DoPaint with FullPaint in ScintillaWX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-16 00:52:17 +00:00
Robin Dunn
d1e2005486 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 23:43:44 +00:00
Robin Dunn
50940aad97 prevent checking for empty string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 23:34:18 +00:00
Robin Dunn
87d562652e tweak the spin button size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 23:33:19 +00:00
Robin Dunn
5e8b10e902 On Windows the wxBitmapButton can't be borderless if you use
wxBU_AUTODRAW, but wxGenBitmapButton can do it easily


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 23:15:53 +00:00
Robin Dunn
b09afc93f5 ON XP when pages are added to a Notebook their colours (and their
children's) are modified to match the theme colours for notebook pages
rather than normal panel colours.  When items are added dynamically
after the fact to the notebook pages then we need to fiddle with the
colours ourself.

Also, since xrced is importing from wxPython.wx then DC.Draw methods
now need to use the old parameter syntax.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 22:44:52 +00:00
Robin Dunn
b86cccf1ba Use unbuffered output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 22:38:07 +00:00
Robin Dunn
60a93116bb Not sure what this was here for
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 22:37:26 +00:00
Robin Dunn
25379d629b Win32 installer script updated for 2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 22:26:18 +00:00
David Elliott
f1ff3d4a3e Allow Clear() to clear the control even when it is not editable.
(patch from Kevin Hock)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 20:12:29 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 13:49:22 +00:00
Robin Dunn
d896a793a0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 05:26:19 +00:00
Robin Dunn
90f7e9c7f7 little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:24:35 +00:00
Dimitri Schoolwerth
5eba439479 Applied patch #877159: Joinable threads might crash app if deleted right after Wait.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:20:42 +00:00
Robin Dunn
eb9b610777 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:11:12 +00:00
Robin Dunn
d2f9bbfd43 little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:08:37 +00:00
Robin Dunn
b856768b04 Allow nested calls to wxPy[Begin|End]BlockThreads instead of
deadlocking when the nested calls try to aquire the Python GIL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:06:39 +00:00
Robin Dunn
b1dfbb7ad8 Added wrappers for the missing wxSpinEvent, which fixes the deadlock
when trying to catch events from wxSpinButton.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 01:04:38 +00:00
Chris Elliott
756d3e7fb5 apply SF patch 876817
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 15:28:37 +00:00
Stefan Csomor
2109485b37 remove some duplicate defines under Mach
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 10:05:39 +00:00
Ryan Norton
b77b87881b A little clarification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 06:24:21 +00:00
David Elliott
b2c5f143fd Added MSWPositionForWxMenu() method which is used to translate wxWindows
menu positions to the ones that Windows is using.  This mainly accounts
for the system menu in maximized MDI child frames.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 05:57:09 +00:00
David Elliott
6edf960cf5 IsInAssert is only available (and only makes sense) in a debug build so
don't try to call it in a release build.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 04:44:37 +00:00
David Elliott
096a56242d Added empty base class constructors. This will still be broken for anything
other than MSW, Mac, and Univ.

Julian: Fix this the right way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 03:52:50 +00:00
David Elliott
ffb649e4c6 * In _GSocket_Get_Mac_Socket(), do not call CFSocketSetSocketFlags to turn
off kCFSocketCloseOnInvalidate.  Furthermore,
  kCFSocketAutomaticallyReenableWriteCallback wasn't part of default flags
  but had been erroneously included here.
* Call CFSocketInvalidate() from _GSocket_Diable_Events instead of from
  _GSocket_GUI_Destroy_Socket.  GSocket calls this from GSocket_close
  and so in combination with the above change and the most recent change
  to gsocket.c the CFSocket should now be invalidated and closed for all
  cases and not just planned shutdown.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 02:50:18 +00:00
David Elliott
9d8278ea64 * Revert Darwin specific changes to GSocket_destroy.
* In GSocket_Shutdown do not call close on Darwin since gsockosx.c will do
  it during CFInvalidate which will be called from GSocket_Disable_Events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 02:42:38 +00:00
David Elliott
fda20787fc * _GSocket_Enable_Events() and _GSocket_Disable_Events() now call
CFRunLoopAddSource() and CFRunLoopRemoveSource() respectively.  They
  no longer call CFSocketEnableCallbacks or CFSocketDisableCallbacks.
* In _GSocket_Get_Mac_Socket() no longer disable callbacks and also do not
  add the runloop source which combined with the above change has the
  same effect as before.
* In _GSocket_GUI_Destroy_Socket() do not remove the runloop source because
  _GSocket_Disable_Events() should have and even if it didn't Mac OS X
  will clean it up in CFSocketInvalidate()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 02:17:16 +00:00
Robin Dunn
bc59c2062c More packager scripts updates. The RPMs will now install icons and
menu items, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 02:11:55 +00:00
Robin Dunn
c207946083 Corrected install_data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 02:10:32 +00:00
Robin Dunn
e75fd8a4ca typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 01:55:47 +00:00
Robin Dunn
8dfc6457b2 Fixed preprocessor warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 01:53:19 +00:00
Robin Dunn
de7b7fe6f6 Got iewin up and running again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 01:51:52 +00:00
Robin Dunn
6c72a02688 check for existance of output files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 01:50:35 +00:00
Robin Dunn
14dfb3d258 Fix compile warning when building DLLs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 01:28:42 +00:00
Robin Dunn
702bbc359f Update for new pickle format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 20:34:44 +00:00
Robin Dunn
8bba149265 Added some missing wx namespace corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 20:33:49 +00:00
Roman Rolinsky
a4c013b2b1 wxGridBahSizer support
exception handling while loading resource

some fixes (GetFirstChild, XRCID instead of FindByName, ...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 18:43:42 +00:00
Julian Smart
31be2bd8ea Added Emulator, configtool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 17:48:33 +00:00
Dimitri Schoolwerth
efb349e4f3 Applied patch #876228: "Current value" always counts up to 100, instead of the max gauge value.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 17:46:13 +00:00
Roman Rolinsky
d563e57f21 replaced by CHANGES.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 15:44:50 +00:00
Julian Smart
3b34ec62bb Corrected wrong reference to Gizmos location
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 15:31:45 +00:00
Julian Smart
aeb3c1cb52 Improved colours in wxUniv -- white (window colour) was
being used as the default.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 14:48:35 +00:00
Julian Smart
02dd0487d1 Suppress spurious icon-related log messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 14:45:56 +00:00
Julian Smart
b6668c257d Added extra check in case CopyFromIcon fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 14:37:28 +00:00
Julian Smart
83ae4c616c Must have event.Skip() in OnSize for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 13:32:07 +00:00
Robin Dunn
59455c67d4 Starting to update the tarball and rpm spec files for 2.5. Mostly
done but some fine tuning still needs done.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:42:43 +00:00
Robin Dunn
47e8744686 Use "import wx". wxPython.wx now has backwards compatible DC's and so
since this module was using the new DC's it could no longer use
wxPython.wx.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:41:22 +00:00
Robin Dunn
36a1dad6e8 Fixed the docstring, default module is now wx, not wxPython.wx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:33:09 +00:00
Robin Dunn
4a7ea057cd Forgot to output the first string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:32:06 +00:00
Robin Dunn
e6477984b1 Don't allow parameterless wxDropSource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:31:25 +00:00
Robin Dunn
2571247b80 API and etc. updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:28:11 +00:00
Robin Dunn
35095c028d new DC API fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:25:58 +00:00
Robin Dunn
95bfd958bd More demo conversion and cleanup from Jeff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 03:17:17 +00:00
Dimitri Schoolwerth
2b5dcd17c1 To use "#pragma warning" a #ifdef __VISUALC__ guard should be used, not a #ifdef _MSC_VER one (CW defines _MSC_VER).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 02:07:44 +00:00
Dimitri Schoolwerth
03a90749df Applied patch #875647, fixes an unused variable warning reported by Borland; Some minor changes such as tab removal, TRUE/FALSE->true/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 02:02:54 +00:00
Robin Dunn
7fcf27da12 x11/popupwin.h wasn't being installed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 01:36:35 +00:00
Julian Smart
69a126b0c7 Added some constants. wxRAISED_BORDER not GTK+-only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-12 11:42:22 +00:00
Julian Smart
38a0984e4c Unicode and ODBC are now compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-12 10:51:45 +00:00
Julian Smart
daf06bb8bc Applied patch [ 825396 ] dbbrowse demo compatible with Unicode
Wlodzimierz Skiba


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 22:08:25 +00:00
Julian Smart
73e68c1d43 Applied patch [ 838940 ] notebook labels are not shown when built with GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 20:58:10 +00:00
Julian Smart
bfe5de8665 Applied patch [ 827399 ] sqltypes.h included without windows.h under Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 20:52:43 +00:00
Julian Smart
6c29712c64 Applied patch [ 851052 ] [msw] Clipboard: Allow automatic format conversions
By Kevin Edwards (ingenuus)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 18:41:29 +00:00
Julian Smart
ae29146343 Reverted bad fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 17:38:11 +00:00
Julian Smart
e8b7a986a6 Applied patch [ 849212 ] Sets SO_REUSEADDR flag on server sockets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 16:54:39 +00:00
Julian Smart
d3d0974f0f Applied patch [ 850483 ] Toolbar bugfix (Mac)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 16:42:47 +00:00
Julian Smart
1a33ac8fb0 Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 16:34:05 +00:00
Julian Smart
ab839dff60 Applied patch [ 791573 ] New feature for FL toorbar buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 16:03:19 +00:00
Julian Smart
10021d29fa Recorded patch [ 837515 ] wxIPaddress + docs patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:52:13 +00:00
Julian Smart
be4bd4636d Applied patch [ 837515 ] wxIPaddress + docs patch
(Ray Gilbert)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:50:10 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:33:01 +00:00
Julian Smart
3ef37e7f4e Always use XPMs in this sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:28:05 +00:00
Julian Smart
b1a8a61082 Applied patch [ 864469 ] WaitForAccept(): 100% CPU Usage (NON-GUI application)
(Alex Thuering)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 14:35:46 +00:00
Julian Smart
7b519e5e0c Applied patch [ 800086 ] GridCellTextEditor wxTE_RICH misbehaving
Don't set the value of the hidden editor control (useless)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 14:28:38 +00:00
Julian Smart
1d6d8b5de0 Applied patch [ 842285 ] comparison for wxIPV4address
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 14:22:36 +00:00
Julian Smart
cfee166d4e Applied patch [ 853850 ] Fixes for wxFormatConverter
(M.J.Wetherell)
Added wxConvertFormat function in debug mode to allow for
unit testing
Added tests/formatconverter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 14:16:32 +00:00
Julian Smart
5a410e4453 Applied patch [ 869522 ] Cleaning of deprecated contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 11:49:40 +00:00
Julian Smart
8a094d7ba9 Applied patch [ 874495 ] wxMSW: Flat buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 11:47:23 +00:00
Julian Smart
8d99dec09b Added missing description for wxNO_BORDER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 11:46:40 +00:00
Ryan Norton
de251aef9b Removed old tests file and replaced with tcl version....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-10 10:38:46 +00:00
Robin Dunn
f87da72205 Beginings of wxX11 support. Much more to do but I have no more time
for it today.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-09 18:34:52 +00:00
Julian Smart
6d9d6350fd Added FromAscii, ToAscii docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-09 11:32:46 +00:00
Robin Dunn
ff931a400e doc tweaks, typo fixed, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-09 02:11:40 +00:00
Robin Dunn
093d613e06 little tweaks to match wxWin changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-09 02:10:39 +00:00
Robin Dunn
4a340a90d1 Updated layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 22:20:47 +00:00
Julian Smart
9f4ed8613c Added wxWS_EX_BLOCK_EVENTS style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 22:20:33 +00:00
Robin Dunn
6dfb13b1b7 Set the DC font before drawing the label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 21:37:45 +00:00
Julian Smart
c92ed9f7a7 Applied patch [ 863936 ] wxGrid scroll bars not drawn.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 15:43:29 +00:00
Julian Smart
80acaf2583 Applied patch [ 851044 ] wxGrid receives wxFocusEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 15:15:45 +00:00
Julian Smart
d02bc4c8d4 Applied patch [ 871014 ] Adding size of control to its position
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 15:05:38 +00:00
Julian Smart
28764ac9d1 Applied patch [ 873021 ] Bug fix for MSW wxComboBox
wxComboBox::GetValue within a wxEVT_COMMAND_TEXT_UPDATED event
should now pass the correct value even if the handler for
wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 14:59:57 +00:00
Julian Smart
30ec5dbb49 Added change log for patch: wxGenericDirCtrl does not accept multiple wildcards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 14:47:26 +00:00
Julian Smart
3da4e4bd4a Applied patch [ 866387 ] wxGenericDirCtrl does not accept multiple wildcards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 14:44:23 +00:00
Julian Smart
93210c68cb Applied patch [ 868061 ] Warning free OGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 14:35:36 +00:00
Julian Smart
6c155d3387 Applied patch [ 867187 ] wxWindows-like markup in TEX2RTF tool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 11:54:30 +00:00
Julian Smart
6ee9b7b53e Applied patch [ 868373 ] Missed Unicode markup in menu sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 11:36:38 +00:00
Julian Smart
c4b7790106 Applied patch [ 872338 ] Minor fixes to forty, fractal and poem demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 11:33:32 +00:00
Julian Smart
95f913a9d6 Applied [ 866603 ] Fixes the listctrl demo's 'Toggle' menu item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 08:43:16 +00:00
Julian Smart
ba597ca831 Applied patch [ 867158 ] Warning free gizmos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 08:35:31 +00:00
Julian Smart
3f8b4a3fbe Applied [ 872574 ] fix of fatal error of preview without printer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 08:29:59 +00:00
Julian Smart
7d5ae6695b Applied patch [ 871762 ] Solution to losing strings in Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 07:41:36 +00:00
Robin Dunn
dfe22a0140 Typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 00:31:16 +00:00
Robin Dunn
f9b46bcb17 Copy Solaris note from 2.4's setup.py
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 00:31:01 +00:00
Robin Dunn
7d3000f8db Updated build and install docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 00:30:39 +00:00
Ryan Norton
ec3ade90e2 Fixed include path for wx/wxchar.h on all configurations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 21:15:39 +00:00
Ryan Norton
f089c15051 Fixed include path for wx/wxchar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 21:12:12 +00:00
Robin Dunn
32958cea3a reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 20:44:56 +00:00
Robin Dunn
05fd1c9e8e Updated overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 18:46:54 +00:00
Julian Smart
7c2ba9a1e1 Added wxFULL_REPAINT_ON_RESIZE style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 15:36:54 +00:00
Robin Dunn
2421eb8278 updated Joystick demo, is now wxDesigner-less
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-07 02:57:40 +00:00
Robin Dunn
82a1f0afe3 It *does* work now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 21:46:44 +00:00
Robin Dunn
33b885b998 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 21:34:51 +00:00
Robin Dunn
ef6c08e5c3 Rename the grid selection mode flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 21:33:34 +00:00
Robin Dunn
4942342c3e Added a set of 2.4 compatibility classes for the wxDC classes that
replaces the normal Draw methods with those that have 2.4 compatible
parameter lists.  These classes are used by default only when
importing from wxPython.wx (the "old" namespace.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 21:32:42 +00:00
Robin Dunn
089142a562 Fixes for the UNICODE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 21:17:32 +00:00
Julian Smart
0a64020858 Added missing event.Skip()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-06 08:54:57 +00:00
Robin Dunn
6046f86450 Ensure that the dirdialog is destroyed after use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-05 19:54:39 +00:00
Julian Smart
0a7cad3a87 Typo corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-05 07:18:33 +00:00
Julian Smart
823faac334 Removed code duplication introduced during wxUniv merge in 1.132
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-03 17:58:51 +00:00
Robin Dunn
f810866394 This file should not have been checked in!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-03 01:20:47 +00:00
Robin Dunn
299647acac Renamed demo modules to be wx-less.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-03 01:14:17 +00:00
Robin Dunn
c6281ceb77 Version number update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 23:41:46 +00:00
Robin Dunn
7a0a63aeee reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 22:00:56 +00:00
Julian Smart
6213bde147 Cure link error under wxGTK on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 20:45:35 +00:00
Robin Dunn
28c628bb93 Fix addtofunc directives foir wxCheckListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 20:42:14 +00:00
Robin Dunn
120826838f Don't use wx[H|V]SCROLL styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 20:41:34 +00:00
Robin Dunn
30d215aa9b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 20:38:22 +00:00
Robin Dunn
e7726f5e5a Some wxOGL tweaks to match what has been done in the C++ classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 20:37:37 +00:00
Robin Dunn
cc6eca3509 New wxDesigner-less version of the MimeTypesManager demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 19:36:26 +00:00
Robin Dunn
31c07ca5a3 wxBell --> wx.Bell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 17:35:26 +00:00
Julian Smart
af5454a410 Fixed menu creation in eVC3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 13:49:56 +00:00
Julian Smart
4b7eab302f wxShapeRegion::SetText shouldn't append to formatted strings list
Addition of accessors to allow an app to do alternate diagram streaming


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-02 11:56:21 +00:00
Robin Dunn
6f40108088 Track and translate typenames where possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-31 20:49:08 +00:00
Václav Slavík
66ff56694e removed obsolete files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-31 17:20:54 +00:00
Julian Smart
12c1948830 Use on-idle updating of menus in wxUniversal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-31 15:13:11 +00:00
Ryan Norton
122c9be085 removed wxUSE_BUILTIN_REGEX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 23:41:47 +00:00
Václav Slavík
1c29c1fead regex libs needs _UNICODE define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 23:19:40 +00:00
Ryan Norton
c5feba0ea3 Cleaned up regex.cpp
fixed strlen problem in regex
many other things related to cleanup of regex.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 22:21:00 +00:00
Ryan Norton
9965cadbde more ifdef C++ stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 22:18:37 +00:00
Robin Dunn
e6132c30ab Use correct method name for GetRowLabelValue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 22:07:08 +00:00
Robin Dunn
74e96f3d21 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:53:14 +00:00
Robin Dunn
f78241f6c0 Ensure we have the capture before releasing it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:48:45 +00:00
Robin Dunn
d147c72424 Make sure the comment is output in the pythoncode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:45:17 +00:00
Robin Dunn
4e6ab75bf8 shift the print position a little
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:43:59 +00:00
Robin Dunn
c3bc3b6184 a bit of tweaking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:39:36 +00:00
Robin Dunn
c843129522 Force integer values for positions and sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:38:32 +00:00
Robin Dunn
3cfc1d6668 wx* and other name fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-30 01:06:02 +00:00
Robin Dunn
d2638b42a8 Rename the .tar.gz to a .tgz
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:51:30 +00:00
Robin Dunn
c0546c3ea7 Compatibility modules for a couple that have gone AWOL in the new namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:50:56 +00:00
Robin Dunn
122070e2a7 Apparently wxPopupWindow position is not screen relative any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:21:38 +00:00
Robin Dunn
72d3f3166a Show how to set print data options when using HTMLEasyPrinting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:21:03 +00:00
Robin Dunn
1202c414ea Added SF Patch#
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:08:42 +00:00
Robin Dunn
e4f4d6533d Fix compile error when building for Python 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:07:26 +00:00
Robin Dunn
02376d7348 Since they are new style classes we need to use the __reduce__
protocol for pickling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 23:06:38 +00:00
Robin Dunn
0dfb2393dd Fixed drawing of the lines data, also ensure that only tuples are
pickled since there is currently a problem with unpickling
wx.Points...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 19:25:47 +00:00
Robin Dunn
fb67a0b14c Set foreground colour when drawing items in the VListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 19:24:16 +00:00
Julian Smart
8e74bcb2a4 Fixed palette so all tools are visible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 10:47:51 +00:00
Václav Slavík
e83389ff45 bad idea, fn_str() returns wchar_t on win32 in Unicode build, we need char* here no matter what
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 09:32:36 +00:00
Ryan Norton
15c2acd23d Added/Fixed some things in wxGetKeyState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 22:46:08 +00:00
Julian Smart
6503f634a9 Removed statusbar removal under WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 17:34:18 +00:00
Julian Smart
d35dec9b11 Fixed missing semicolon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 09:44:34 +00:00
Julian Smart
a96b4743ff Added wxUSE_POCKETPC_UI to distinguish between using
combined toolbar/menubar and using separate ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 01:07:31 +00:00
Julian Smart
c0f984728e Corrected typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 22:31:01 +00:00
Julian Smart
830e6d754c Updated for eVC4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 18:02:30 +00:00
Julian Smart
e2c922f53f eVC4 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 17:57:00 +00:00
Julian Smart
a40b3f5df7 Can't yet use RegisterDragDrop, RevokeDragDrop on eVC4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 17:28:13 +00:00
Julian Smart
2d36b3d847 WinCE 4 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 17:24:00 +00:00
Julian Smart
504de6d140 Some further missing symbols for WinCE 4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 17:17:21 +00:00
Václav Slavík
9d1f22e7c2 unified to use ASCII for ZIP entries and fn_str() when passing archive name to unzip.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 08:52:05 +00:00
Julian Smart
dac3065d25 WXK_PRIOR/WXK_NEXT are aliases for WXK_PAGEUP/WXK_PAGEDOWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-26 11:33:15 +00:00
Roman Rolinsky
2481bf3cb6 added subclass attribute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-25 23:28:17 +00:00
Julian Smart
ae071f3106 Added FindById doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-25 11:59:29 +00:00
Ryan Norton
c4053ed35a revert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 21:53:59 +00:00
David Elliott
a685e84a97 Added note about (not) multiply inheriting from wxEvtHandler which includes
a very brief technical overview of how events work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 19:53:29 +00:00
David Elliott
2d93e5a259 Regenerated with Bakefile which removes the regextest sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 19:43:34 +00:00
David Elliott
ca6c45b23d Regenerated with Bakefile.
wxCocoa: Added src/mac/gsockosx.c to build.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 19:37:09 +00:00
Ryan Norton
ad18ae6252 Fixed compilation and
only does mdi tests when enabled in setup.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 19:27:47 +00:00
Václav Slavík
30f2fa6c53 fixing the regex mess that Ryan wasn't yet able to fix himself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 12:42:57 +00:00
Ryan Norton
2138129e25 wxMenuBar derives from wxWindow...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 04:52:48 +00:00
Ryan Norton
010024e17e Fixed one of the two MDI problems...see comments
for possible solutions to the others.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 04:47:00 +00:00
David Elliott
7c52e8ef95 wxCocoa: Enable wxSocket support using new CFSocket implementation from wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 04:39:05 +00:00
David Elliott
a38b65ab35 * Implemented according to Apple CFSocket documentation:
kCFSocketConnectCallBack: Called in response to a successful connect() and
    of course applies to client sockets only. Fails assertion if received
    from a server socket. Calls GSocket's Detected_Write otherwise.
  kCFSocketReadCallBack: Called whenever data is available to read or in
    the event that a new connection is waiting to be accepted. Call's
    GSocket's Detected_Read.
  kCFSocketWriteCallBack: Called whenever data can be written to kernel buffer.
    Call's GSocket's Detected_Write
* Added ALL_CALLBACK_TYPES macro which specifies all of the above three.
* Added (by virtue of ALL_CALLBACK_TYPES) the kCFSocketConnectCallBack to
  the calls to CFSocketCreateWithNative and CFSocketDisableCallBacks during
  GUI socket data creation.
* Use the default flags for CFSocket which automatically reenable the
  callbacks, but continue to disable close of fd on CFSocket invalidation.
  Eventually, GSocket should allow the GUI implementation to override close
  so that we can avoid calling the > 10.2 CFSocketSetSocketFlags function.
* CFRelease the socket after invalidating it (fixes memory leak)
* When adding/removing callbacks use kCFSocketReadCallBack for server
  GSOCK_CONNECTION and kCFSocketConnectCallback for client.
* When adding/removing callbacks GSOCK_LOST should do the same thing as
  GSOCK_INPUT (Thanks Kevin Hock)
* When enabling events, do not enable kCFSocketConnectCallBack for servers.
  It should never be called anyway since connect() should never be used
  on a server socket.
* When disabling events, disable ALL_CALLBACK_TYPES.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 04:04:40 +00:00
Robin Dunn
dae0faa6be reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 03:09:10 +00:00
David Elliott
1c7edd1d3c In GSocket_Destroy reorder GUI_Destroy and Shutdown when compiling for Darwin.
This is necessary to comply with the Apple documentation for CFSocket which
states quite explcitly that the CFSocket must be invalidated prior to close.

Likewise in GSocket_Read don't enable input events until we have finished
reading the data.  This is necessary because an input event will be
immediately generated but all the data will have been read by the current
callback which leads to the GSocket code thinking the connection has been
lost and when wxYield recursion is involved will lead to crashes or an assert.

Because we are doing a compile time test only for Darwin this will also
affect wxGTK running on Darwin. It appears possible for the new order to work
on all platforms but more testing would be required.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 02:49:07 +00:00
Robin Dunn
f775c30dd9 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 02:45:57 +00:00
Robin Dunn
7eae615bad reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 02:38:31 +00:00
Robin Dunn
5cbdf16dac regnenerated image modules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 02:36:30 +00:00
Robin Dunn
54b29c1f98 Fixed a couple wxString typemaps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 02:35:33 +00:00
Robin Dunn
dd83f6184e delete the .pyc files before making a preview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 01:39:22 +00:00
Robin Dunn
998e6e9fdb Fixed a typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 01:26:42 +00:00
Robin Dunn
88c0b10897 Aliasing wxDC methods like was dangerous...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 01:24:58 +00:00
Robin Dunn
d40e73919c More adjustments to aliases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 01:12:25 +00:00
Robin Dunn
0dd25e819c Tool tweaks and metadata update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 01:09:51 +00:00
Robin Dunn
61940a7061 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 23:27:57 +00:00
Robin Dunn
487febf601 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 21:39:24 +00:00
Robin Dunn
cf763f5b94 backwards compatibility aliases can be used in the wxPython namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 21:37:21 +00:00
Robin Dunn
82a074ce2b typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 21:35:31 +00:00
Robin Dunn
3798e298a4 Updated tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 19:56:51 +00:00
Julian Smart
1066fece29 MOre wxUSE_... fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 19:42:05 +00:00
Robin Dunn
0f43fbdf6f wxPython metadata xml
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 19:31:59 +00:00
Robin Dunn
685d898512 Added XML simplification scripts for generating the wxPython metadata xml.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 17:45:54 +00:00
Julian Smart
f49347d1b7 Removed out of date comment about Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 16:07:40 +00:00
Ryan Norton
128b33a6fc Fixed newlines :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 15:56:20 +00:00
Julian Smart
35eace3ae6 Added wxUSE_TOOLBAR, wxUSE_STATUSBAR tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 12:39:33 +00:00
Julian Smart
5feef956ce Applied patch [ 864570 ] adjustement of FL contrib to change in wx/log.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 10:47:39 +00:00
Julian Smart
23290a8c8f Applied patch [ 861884 ] adjustement of bombs demo to wxBombsCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 10:45:28 +00:00
Julian Smart
e176d9f7c0 Added Bombs demo eVC project file from ABX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 10:32:21 +00:00
Julian Smart
965f1e4388 Added minimal sample WinCE project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 10:17:28 +00:00
Julian Smart
5671b3b68f Added comments for WinCE shortcut suggestion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 10:02:08 +00:00
Julian Smart
676d655065 Some WinCE fixes from ABX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 09:18:16 +00:00
Ryan Norton
6ed8156e8a Added note about deleting returned object (OpenFile)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 03:16:37 +00:00
Dimitri Schoolwerth
bd5d41f65d Applied patch #864557 (Adjustment of richedit sample to new FindColour solution).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-23 03:01:37 +00:00
Robin Dunn
4a9067b921 wxTaskBarIcon works on wxGTK now too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-22 21:25:58 +00:00
Robin Dunn
a253aa2044 Make the comment colors have a bit more contrast, and reduce the
timeout on the splashscreen.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-22 20:59:16 +00:00
Ryan Norton
55448f251a Removed regextest :).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-22 20:38:18 +00:00
Robin Dunn
d4b73b1b8e More lib and demo patches to drop the wx prefix (Jeff has been busy!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-22 19:09:54 +00:00
Ryan Norton
88568e48e4 1.
Changed things others suggested

2.
Changed search text cntrl to a multiline one


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-22 09:36:19 +00:00
Ryan Norton
e2d1ad0cc1 1.
Only owner draw menus on MSW

2.
Handle GRETA compilations errors


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 22:44:53 +00:00
Ryan Norton
4e3b466588 Added Status Bar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 22:19:25 +00:00
Ryan Norton
acee956c6d Added -
1.
Owner drawn menu items (sort of)

2.
Match/Compile time


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 22:03:12 +00:00
Ryan Norton
81e6573009 Changed main frame style to wxDEFAULT_FRAME_STYLE | wxTAB_TRAVERSAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 20:37:17 +00:00
Julian Smart
00cb0756b4 Correction for gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 13:19:44 +00:00
Ryan Norton
7c11dce5f2 Changed GRETA compile flag - fixing output (was matching in reverse before....)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 12:22:59 +00:00
Ryan Norton
b5bdef5532 Too many changes :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 11:51:33 +00:00
Václav Slavík
651bb0c9e5 link against the net library, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 10:27:13 +00:00
Ryan Norton
8d4dc98f75 Added some notes and other changes.....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 10:09:36 +00:00
Ryan Norton
24c8053b88 Fixed TEST_SCOPEGUARD (newer version prepends wx to macros...)
C:\\wxWindows\\samples\\console\\console.cpp(3379) : error C2065: 'ON_BLOCK_EXIT0' : undeclared identifier
C:\\wxWindows\\samples\\console\\console.cpp(3380) : error C2065: 'ON_BLOCK_EXIT1' : undeclared identifier
C:\\wxWindows\\samples\\console\\console.cpp(3381) : error C2065: 'ON_BLOCK_EXIT2' : undeclared identifier
C:\\wxWindows\\samples\\console\\console.cpp(3384) : error C2065: 'ON_BLOCK_EXIT_OBJ0' : undeclared identifier
C:\\wxWindows\\samples\\console\\console.cpp(3385) : error C2065: 'ON_BLOCK_EXIT_OBJ1' : undeclared identifier
C:\\wxWindows\\samples\\console\\console.cpp(3386) : error C2065: 'ON_BLOCK_EXIT_OBJ2' : undeclared identifier


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 10:02:35 +00:00
Ryan Norton
abc1160026 Committed Mike's Update Patch
862130 wxZlibInput/OutputStream gzip support


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 04:30:32 +00:00
Ryan Norton
301deecc27 Committed Mike's Update Patch
862130 wxZlibInput/OutputStream gzip support


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 04:28:45 +00:00
Ryan Norton
7e658c4b3e Scopeguard test doesn't work either due to some undefined functions/macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 00:05:35 +00:00
Ryan Norton
34126b5484 quick fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-21 00:04:17 +00:00
Ryan Norton
d890ea0d4c size_t is always unsigned....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 22:25:48 +00:00
Václav Slavík
cfde0f19b6 minor corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 22:16:32 +00:00
Robin Dunn
d9e12f1a32 Clean out the old stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 21:28:12 +00:00
Robin Dunn
cbd72d4fb4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 20:03:09 +00:00
Robin Dunn
39f61e253d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 19:55:26 +00:00
Robin Dunn
81cfe5e13e Aquire the GIL before raising the NotImplementedError exception
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 19:54:10 +00:00
Robin Dunn
2678dd26fb Added wxHtmlCell::[S|G]etId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 19:53:24 +00:00
Robin Dunn
33785d9f22 More lib and demo changes for dropping the wx prefix, from Jeff G.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 19:36:30 +00:00
Ryan Norton
2b0a7c092c [ 835171 ] Show hidden files in wxGenericDirCtrl
(genericdirctrl is neat!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 15:13:15 +00:00
Ryan Norton
dd12f8bbcf I should modify this more :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 14:04:08 +00:00
Julian Smart
21f6094583 Added wxPATH_NORM_SHORTCUT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:59:13 +00:00
Ryan Norton
892dd3cef3 Added another sanity check....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:54:13 +00:00
Ryan Norton
816e36172a Reversed,...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:52:02 +00:00
Ryan Norton
6f070389aa Comment....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:47:25 +00:00
Ryan Norton
5294e30a38 Added an assert...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:39:40 +00:00
Ryan Norton
7b0c29b97b 1.
Regenerated Bakefiles

2.
Added regextest sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:08:29 +00:00
Julian Smart
0d8b87ac8a Applied patch [ 853031 ] Japanese po file
Supplied by Hiroshi Saito, Taishin Kin made the last
adjustment.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 12:18:54 +00:00
Ryan Norton
13c3eab75a Contact info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 09:05:08 +00:00
Robin Dunn
d03fd34d3c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 01:17:52 +00:00
Robin Dunn
e732529375 Oops
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 01:14:15 +00:00
Robin Dunn
707fbe5d0f Fixed a couple namespace issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 01:03:44 +00:00
Robin Dunn
76f48e3308 Fixed indetation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 01:03:19 +00:00
Robin Dunn
b2dc104421 More changes to make the autodocs be better, made all the namestrings
and such be visible to swig so the autodoc generator knows how to
rename them.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 01:01:49 +00:00
Ryan Norton
161c73a392 Noted where the documentation was
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 23:43:45 +00:00
Ryan Norton
e970653a2d Added some documentation :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 23:32:40 +00:00
Robin Dunn
196addbfe0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 04:47:55 +00:00
Robin Dunn
64e8a1f072 autodoc docstring fixes and such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 04:45:35 +00:00
Robin Dunn
b0640a71ca Version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 04:42:39 +00:00
Robin Dunn
28a15b3e4c Updated SWIG patches for new CVS line numbers, also output "int" for
enum types in the autodoc strings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 04:39:38 +00:00
Dimitri Schoolwerth
98de2b6805 Always let (deprecated) FindColour() return a new instance of a found colour, because otherwise multiple calls to FindColour() will share the same wxColour; Added a wxLogDebug message when FindColour() is used because it shouldn't be used without modifying user-code probably (Returned wxColours must now be released).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 02:09:01 +00:00
Dimitri Schoolwerth
0c65afdb45 Partially applied patch #8618848 ("adjustment of bombs demo to wxBombsCE"). Applied the source changes only, not the project changes; (wx-)modernized the demo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-19 01:34:40 +00:00
Václav Slavík
02a0c28d96 info about what is generated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 21:29:57 +00:00
Robin Dunn
3a04f1432d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 19:11:15 +00:00
Robin Dunn
c1ea08d355 Tweaking names (Thanks Jeff!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 19:10:26 +00:00
Robin Dunn
6158f936ec Tweaked some sample code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 19:08:13 +00:00
Dimitri Schoolwerth
792626ca3d Include wx/confbase.h which is needed by this file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 14:54:25 +00:00
Václav Slavík
453bd2ed63 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 14:32:31 +00:00
Václav Slavík
5eb3512030 regex lib needs wx headers now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:42:09 +00:00
Václav Slavík
539fb7a26c reverted relative include path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:41:34 +00:00
Ryan Norton
e15aca7e47 Ak. Corrected wxUSE_UNICODE checking...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:19:27 +00:00
Ryan Norton
4ce84ac957 Oh Henry :).
He didn't implement dumpchr correctly for unicode...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:17:53 +00:00
Ryan Norton
86d35a4466 Added an extra c header for memcmp and stuff...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:12:58 +00:00
Ryan Norton
85b6c59b89 Make include path more literal for bcc...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 10:08:04 +00:00
Václav Slavík
5c3dca2f8e minor clarification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 07:59:36 +00:00
Gilles Depeyrot
4f5b1fc4ca corrected comments for wxMac compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 07:38:00 +00:00
Ryan Norton
fa9982d710 1.
Only checks platform #defines in C++ now

2.
A couple /* within /* warnings were fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 03:34:22 +00:00
Robin Dunn
2fa9ab8174 Fixed a very weird typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 00:44:51 +00:00
Robin Dunn
61563ef347 Reworked how stock objects are initialized. They now have an
alternate __class__ until the App is initialized so they will raise an
exception if anybody tries to use them before the C++ object has been
created.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 00:08:42 +00:00
Robin Dunn
c4f8516517 Fix __repr__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 00:02:35 +00:00
Robin Dunn
a6d2f5bb02 Added FindById
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-18 00:01:33 +00:00
Robin Dunn
9e58eb5674 Reworked how stock objects are initialized. They now have an
alternate __class__ until the App is initialized so they will raise an
exception if anybody tries to use them before the C++ object has been
created.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 23:59:57 +00:00
Robin Dunn
57b1892fb6 Added wxGetKeyState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 23:58:04 +00:00
Robin Dunn
d6071228a9 wxPython needs wxRTTI info for wxToolBarToolBase in order to return
objects of the right type.  Also made FindById public.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 21:12:36 +00:00
Ryan Norton
e0c749a72f 1.
Converted debug.h to C

2.
Cosmetics


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 19:51:03 +00:00
Ryan Norton
5d61dafdfa Header Cosmetics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 19:41:17 +00:00
Ryan Norton
f2cc8cbbbd Header Cosmetics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 19:40:06 +00:00
Ryan Norton
34cbe514cf 1.
Added Release With Debug Info to regex.dsp

2.
Added Release Unicode With Debug Info to regex.dsp and wxWindows.dsp

3.
Converted DS's C++ comments in regcustom.h and regex.h to C

4.
Converted defs.h and all headers it includes to C from C++ by
changing all C++ comments to C and using #ifdef __cplusplus to keep out C++-specific stuff.

5.
Changed wx_wchar to #define wx_wchar wxChar instead of copying wxchar.h code in regcustom.h.

6.
Changed the macros around a bit in regcustom.h.  Originally duplicated code from wx/defs.h.  Now uses SIZEOF_WCHAR_T to get the approriate data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 19:30:31 +00:00
Ryan Norton
a2b9e95202 Got rid wx-license
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 19:00:02 +00:00
Robin Dunn
80b27b4eb2 Swtch to using Bind, and use better styles for the code viewer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 03:29:47 +00:00
Robin Dunn
9d6685e21c Added PyPlot
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 03:25:56 +00:00
Robin Dunn
b881fc787d Lots of wx namespace updates for the wx.lib package and the demo from
Jeff Grimmett with some tweaks and changes from Robin


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-17 00:34:40 +00:00
David Elliott
e1f4ff6ddc Added wxAutoNSAutoreleasePool to Create(Tool|Status)Bar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 19:30:41 +00:00
David Elliott
7c5fbe2a79 1. Initialize m_mouseDownTool = NULL. Fixes crash when clicking a non-tool part of the toolbar before clicking a tool.
2. Added wxAutoNSAutoreleasePool to CreateButtonCell() and Realize()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 19:28:21 +00:00
Ryan Norton
0643659a4e Commented out WXK_CONTROL....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 18:22:49 +00:00
David Elliott
6613dc3fd6 In UpdateFrameNSView size the toolbar to its best size.
When creating or setting a frame's toolbar, SetOwningFrame on it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 17:26:37 +00:00
David Elliott
715c1da4a7 wxCocoa: New native wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 15:44:11 +00:00
David Elliott
7dafb55fde Very basic wxToolBar implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 15:36:56 +00:00
David Elliott
2cda55c5db Make UpdateFrameNSView public for new native wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 15:25:12 +00:00
Julian Smart
ecd6e7ea89 Unicode compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 15:06:23 +00:00
Julian Smart
37c7aad682 Open Watcom correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 14:10:24 +00:00
Julian Smart
06b042dc3d Pass -mwindows when linking the GUI samples under Wine
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 10:36:18 +00:00
Ryan Norton
f3a41afd52 Newline madness :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-16 04:57:48 +00:00
Václav Slavík
30803ef18f compilation fix for tooltip patch code applied by Julian and w32api
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 21:50:56 +00:00
Václav Slavík
690201a250 compilation fix for tooltip patch code applied by Julian and w32api
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 21:43:59 +00:00
David Elliott
a00daa65ec Use wxBitmap::GetNSImage() in wxDC::DrawBitmap. Mask support now works.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 21:07:44 +00:00
David Elliott
9c54e4ae1f Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either
with or without the bitmap mask applied.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 19:30:54 +00:00
Ryan Norton
7b70a3257f reversed some parts of wxGetKeyState for linkage reasons...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 17:16:04 +00:00
David Elliott
f9c135f5ec Strip menu codes from label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 16:49:46 +00:00
David Elliott
bed6fe0c16 Wrap some functions with wxAutoNSAutoreleasePool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 16:23:29 +00:00
David Elliott
eb537cfb1c Improved idle event processing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 15:57:42 +00:00
Václav Slavík
9bfe7ad92d regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 11:42:03 +00:00
Ryan Norton
ddc8d969f8 reversed change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 04:17:35 +00:00
Ryan Norton
35713466d0 fix broken compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 02:21:53 +00:00
Ryan Norton
7b0f0de365 fix gcc warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 02:20:54 +00:00
Ryan Norton
c2935c26d7 Fixed tabs (i.e. turning into spaces...) Part 2...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 01:03:43 +00:00
Ryan Norton
960cb7d715 Fixed tabs (i.e. turning into spaces...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 01:02:07 +00:00
Ryan Norton
2a68dd9e19 (Fixed?) CHRBITS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:59:51 +00:00
Ryan Norton
439d344b6c Added u to end of library name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:36:44 +00:00
Ryan Norton
2ffcce508e Quick fix.....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:28:20 +00:00
Dimitri Schoolwerth
04fdd8736a Fixed Mac CodeWarrior compilation (there's no <sys/types.h>).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:24:35 +00:00
Ryan Norton
ebacd1fe81 Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:14:44 +00:00
Ryan Norton
e5804ce70a Uncommented Brian Vitors stuff...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:05:04 +00:00
Ryan Norton
f83b65f570 Added debug unicode config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 00:03:07 +00:00
Ryan Norton
cffadd8447 (should) fix unix compilation...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:58:55 +00:00
Ryan Norton
104cdef643 TODO note :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:39:44 +00:00
Ryan Norton
6ed892f3f2 wxGetKeyState as per feature request :).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:35:21 +00:00
Dimitri Schoolwerth
c10eeb63ba Fixed bug #859996: "Wrong path in BuildCVS.txt". As well as a couple of other minor changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:11:12 +00:00
Ryan Norton
f97c9db7ae Put the locale funcs here and had them call the correct CRT function via wx versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:06:05 +00:00
Ryan Norton
f5386212fe Various fixes and warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:05:04 +00:00
Ryan Norton
0f314c30b8 Made funcs extern...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:04:53 +00:00
Ryan Norton
328b515e87 removed funcs...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 23:04:43 +00:00
Václav Slavík
505c8ccdb3 added checks for Xxf86vmode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 22:46:22 +00:00
Ryan Norton
83842a0ba3 Made the #if wxUSE_UNICODE check correctly...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 22:20:34 +00:00
Ryan Norton
dece3bfd82 AK! TYPO!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 22:19:58 +00:00
Ryan Norton
80e10e8b74 Set CHRBITS to the "correct" amount.
Also some other spruce-ups.

(sorry, don't know how to be more specific than this!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 22:18:37 +00:00
Václav Slavík
48c15d381c fixed fatal typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 22:03:14 +00:00
Václav Slavík
4bae0a9464 fixed Makefile.in for samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 21:40:24 +00:00
Ryan Norton
fc4aca1838 Some unicode changes...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 19:36:35 +00:00
Gilles Depeyrot
102c07fe87 wxMac mouse wheel, long file names and unix sockets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 19:24:17 +00:00
Gilles Depeyrot
79f2eb8055 corrected wxUSE_UNICODE conditional compilation tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 18:53:36 +00:00
Gilles Depeyrot
87ec9b8f6f corrected SF bug #809314: wxDynamicLibrary::ms_dllext definition for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 17:35:56 +00:00
Stefan Neis
8d902dd64b Fixed mouse event generation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 17:32:45 +00:00
Ryan Norton
1ce5dd35eb 1.
Fixed Exception handling in MSVC project (\\GX)

2.
No longer wxUSE_NEW_REGEX, just wxUSE_UNICODE

3.
Various changes concerning #2

NOTE:  I testing this in unicode and it works!!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 16:57:30 +00:00
Ryan Norton
fdde072772 Reversed Change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 16:36:08 +00:00
Stefan Neis
919312f767 Bugfix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 13:13:53 +00:00
Václav Slavík
428b6942f2 fixed compilation errors, made messages more human-oriented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 11:53:15 +00:00
Václav Slavík
755a8205b8 cleaning CR/LF mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 11:07:04 +00:00
Ryan Norton
e83f230124 warning...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 04:30:45 +00:00
Ryan Norton
7b758e8f43 Reneabled inlining, but kept warnings disabled....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 04:23:35 +00:00
Dimitri Schoolwerth
57ba8fb858 Fixed undeclared identifier compile error.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 04:01:43 +00:00
Ryan Norton
ea6747c168 Fixed 2 warnings -
VC++ simply doesn't want to inline that function....


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 03:45:58 +00:00
Ryan Norton
25c884be6d Fixed a warning....
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 03:45:04 +00:00
Ryan Norton
7bca096784 Added last updated to it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-14 03:07:21 +00:00
Ryan Norton
f220b00998 Updated regex docs to remove license...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 23:50:08 +00:00
Ryan Norton
11b63c6895 Quick change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 23:18:06 +00:00
Ryan Norton
49bf0b0164 Made compatible with new regex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 23:13:56 +00:00
Václav Slavík
74500461df reverted previous change (except for tiny part that actually made sense)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 22:23:44 +00:00
Václav Slavík
8854c3d7a9 not used anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 22:17:44 +00:00
Gilles Depeyrot
27a52ff961 use wxMac Mach-o GUI-specific functions (gsockosx)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:49:01 +00:00
Gilles Depeyrot
633040eda1 added -headerpad_max_install_names option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:46:11 +00:00
Julian Smart
d030c68a2f Applied patch by Dimitrie O. Paun <dpaun@rogers.com> to get configure
working with Winelib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:36:02 +00:00
Julian Smart
bc0aebab3e Remove bad casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:32:41 +00:00
Gilles Depeyrot
7acd73744b regenerated to use gsockosx and unix sockets when building Mach-o wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:30:59 +00:00
Gilles Depeyrot
d40f26be76 use gsockosx and unix sockets when building Mach-o wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:25:16 +00:00
Gilles Depeyrot
d337031039 added -headerpad_max_install_names option to generated shared-ld script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 20:21:35 +00:00
Mattia Barbon
2442ce1bf1 Moved wxArrayString::GetStringArray() out of
WXWIN_COMPATIBILITY_2_4 (at least until alternatives are available).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 16:59:31 +00:00
Gilles Depeyrot
e13854762b GSocket (Generic Socket) Mac OS X mach-o part by Brian Victor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 11:05:48 +00:00
Julian Smart
a1d48124ea Added warning suppression
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 10:43:25 +00:00
Julian Smart
5df41a232d Fixed Unicode compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 10:31:01 +00:00
Julian Smart
4739346e19 Applied patch [ 859194 ] wxDateTime::SetFromDOS gives unpredictable results
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 10:28:29 +00:00
Julian Smart
5b5ea46641 Added wxUSE_TOOLTIPS guard for previous patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 10:24:00 +00:00
Julian Smart
4a5d781ca6 Applied [ 858342 ] Event-based processing of item tooltips in generic TreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 10:20:48 +00:00
Ryan Norton
cbf3565d62 Quick fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 09:55:50 +00:00
Ryan Norton
b3bfe4e510 Brian Victor's Patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 09:25:52 +00:00
Ryan Norton
f2ebd959e6 Brian Victor's Patch & Cleanups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 09:25:29 +00:00
Ryan Norton
63c51a937e Added Brian Victor's Patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 09:24:47 +00:00
Ryan Norton
2980fc88d3 Display correct refresh rate & fixed reset mode with display sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 08:48:54 +00:00
Ryan Norton
73b89f7007 Implemented resolution changing using X11 video extentions\nBe sure to link with the appropriate libs (-lXxf86vm -lXinerama)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 07:29:57 +00:00
Ryan Norton
e07d33e724 Added some placeholders...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 03:53:08 +00:00
Robin Dunn
070a4f2d3a Switch to a read-only combobox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 01:40:35 +00:00
Robin Dunn
76343679d0 Added a sample to the demo showing how to change the cursor, what all
the stock cursors are, and how to set a custom cursor.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 01:25:15 +00:00
Robin Dunn
dc08fedb1c Fixed cursor resource names to actually match what's in the resource file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 00:37:02 +00:00
Václav Slavík
395a670159 don't return error if we can't load English catalog, it is normal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-13 00:21:32 +00:00
Václav Slavík
5819297093 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 23:53:05 +00:00
Václav Slavík
0a904ad412 don't crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 22:03:43 +00:00
Dimitri Schoolwerth
6702110216 Corrected size of staticbox borders when running OS X Panther or higher.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 21:04:36 +00:00
Václav Slavík
b2ec1c8275 added link to XRC documentation elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 20:45:02 +00:00
Václav Slavík
6cc78259af wxScrolledWindow can have children, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 20:41:58 +00:00
Dimitri Schoolwerth
a449f8407b Applied fix for patch #846732 'filedalog long filename support'. File dialog now returns ':' separated paths again with Classic/Carbon builds. The fix is attached to the same patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 02:19:00 +00:00
Dimitri Schoolwerth
ffafd8a55b Fixed notebook redraw problems when using XP theme with Classic appearance.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 22:20:22 +00:00
Gilles Depeyrot
3e655b7ab2 updated CodeWarrior 5.3 project with latest file changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 21:28:17 +00:00
Robin Dunn
9fd4be5571 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 21:12:51 +00:00
Julian Smart
9bdb105270 Commented out WM_MOUSELEAVE until it can be fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:17:44 +00:00
Robin Dunn
c9c7117a20 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:14:28 +00:00
Robin Dunn
3f0ff538b1 Little changes to match recent changes in wxWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:07:50 +00:00
Robin Dunn
bf5ff0c308 Regenerated the renamers with the new build_renamers.py
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:06:35 +00:00
Robin Dunn
05a03b016a Moved simple from demo to samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:04:46 +00:00
Robin Dunn
8994c3c20c Run swig from the main setup.py when building the renamer's XML
instead of from build_renamers.py.  This makes it easy to ensure that
the same flags are used.  Also, use the new swig flag to generate the
XML after the python language module has run, rather than instead of.
This gives us more info in the xml output.

Updated build_renamers.py to expect the xml file to already be
generated, and also allow it to run with a xml doc tree from libxml2
rather than the xml.sax module.  This makes the extraction of info
much cleaner and logical since we usually need info from child or
grandchild nodes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 20:03:42 +00:00
Robin Dunn
7cb55566ba Get rid of this old never finished file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:56:44 +00:00
Robin Dunn
372bde9b72 Kevin O's demo modules fixup patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:55:48 +00:00
Robin Dunn
0221a4c390 Another try at fixing this patch so it applies cleanly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:46:13 +00:00
Robin Dunn
a2526d81f4 Cleaned up a bogus newline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:31:06 +00:00
Robin Dunn
3b2fa8c6f3 A little tweak to the usage text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:25:33 +00:00
Robin Dunn
1e9b37a2fa Updated the docstring patch to match current SWIG CVS line numbers and
such.

Added swig.xmlout.patch, which fixes a couple problems in the XML
output of SWIG: an extra "/>" was removed and newlines in attribute
values were changed to the #10; entity reference so they will be
preserved by parsers. Also, added options for dumping or writing to a
file the XML of the parse tree *after* other language modules have
been run (previously you could only do the XML output *instead of* a
regular language module.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 19:07:00 +00:00
Robin Dunn
19ab38e730 Updated the description of wx.PopupTransientWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 17:43:05 +00:00
Chris Elliott
cb928fe350 remove files for win 3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 13:27:59 +00:00
Julian Smart
291dddd7dc Applied patch [ 847127 ] HELP button displayed by wxMessageDialog with wxSTAY_ON_TOP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 12:37:41 +00:00
Julian Smart
355a5e2bd3 Applied patch [ 840721 ] convenience function wxRect::GetBottomRight
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 12:33:11 +00:00
Julian Smart
dd33b115d6 Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:37:37 +00:00
Julian Smart
a55f5a1136 Applied [ 857819 ] STC CopyToClipboard uses LF on win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:32:44 +00:00
Julian Smart
19d821c536 Applied [ 856726 ] Tests for gzip streams
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:29:52 +00:00
Julian Smart
19d0f58d39 Applied patch [ 843965 ] RC/WXRC/XML related contribs and utils cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:27:56 +00:00
Julian Smart
dacaa6f142 Applied patch [ 846809 ] Cleaning of 11 samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:25:46 +00:00
Julian Smart
623f5f7015 Applied patch [ 843287 ] wxNotebook remove page problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:18:42 +00:00
Julian Smart
9b3a382041 Applied patch [ 850594 ] wxFileName(_T("/fred")).GetFullPath() asserts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:10:15 +00:00
Julian Smart
cd2a4e161d Applied patch [ 856318 ] A few Wine fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:06:56 +00:00
Julian Smart
47831c68b6 Applied [ 841609 ] wxFile::m_error not initialised
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:59:05 +00:00
Julian Smart
e32d483606 Applied patch [ 857446 ] wxStaticCast evaluates argument twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:54:38 +00:00
Julian Smart
557c9f5b0a Applied patch [ 829367 ] Correctly handle mouse wheel for X Windows GTK 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:35:17 +00:00
Julian Smart
206d3a16ca Applied patch [ 829144 ] Compilation error fixes for samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:32:15 +00:00
Julian Smart
4666bb5f2e Applied patch [ 829072 ] Splitter rendering fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:24:02 +00:00
Julian Smart
bb56b0a828 Applied [ 828322 ] Use gdk_draw_polygon for the outline in DoDrawPolygon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:14:38 +00:00
Julian Smart
aad6765cbd Applied patch [ 828303 ] Slight wxColour cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 10:10:40 +00:00
Julian Smart
12ac619f42 Applied [ 827604 ] missing method for wxCalendarEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:56:02 +00:00
Julian Smart
b6fa290b5a Applied [ 827600 ] wxCalendarCtrl missing public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:52:02 +00:00
Julian Smart
e5297b7f46 Applied some of [ 810965 ] Implement wxEVT_LEAVE_WINDOW with TrackMouseEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:46:41 +00:00
Julian Smart
6f951810a1 Applied patch [ 816023 ] wxDialog overrides font setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:10:03 +00:00
Julian Smart
95c430aa2e Aplied patch [ 816113 ] Inconsistent GetCharWidth over platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:05:48 +00:00
Julian Smart
ddc4f3b528 Applied patch [ 817317 ] fixes for errors and warnings reported by MinGW for utils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:01:25 +00:00
Julian Smart
b1755cdb31 Applied patch [ 817665 ] make file: URL return 0 on GetInputStream() for missing file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 08:51:17 +00:00
Julian Smart
6eaebb297a Applied patch [ 817734 ] fix for cvs head with wxUSE_STD_IOSTREAM=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 08:48:01 +00:00
Julian Smart
6da1ce6166 Applied patch [ 818336 ] Add timestamp to gzip out stream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 08:43:28 +00:00
Julian Smart
133fb2a3a0 Applied patch [ 816021 ] SetFont without m_widget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 08:06:08 +00:00
Julian Smart
3fc93ebd18 Applied patch [ 818941 ] Initialize vars and clear wxImageList
Also small speedup in wxFileIconsTable


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 08:01:04 +00:00
Julian Smart
cea62f9c12 Applied patch [ 819171 ] wxEventLoop::Run silently eats all exceptions...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:55:06 +00:00
Julian Smart
61f3e0f5c1 Applied patch [ 819044 ] Adds MSW wxPen::GetDashCount
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:44:53 +00:00
Julian Smart
5955710c8b Applied [ 821234 ] Fix: erroneous assertion failed wxListBox::SetSelection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:40:44 +00:00
Julian Smart
d79df32cb6 Applied patch [ 824244 ] wxMSW event loop fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:35:24 +00:00
Julian Smart
156194e1d5 Applied patch [ 827011 ] Event-based processing of item tooltips in wxTreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:30:20 +00:00
Julian Smart
905f21104d Applied patch [ 810585 ] wxTextCtrl::GetTextLine returns empty String
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 07:12:27 +00:00
Julian Smart
a3a28c50a1 Applied [ 799292 ] wxWizard and Validator Bug and Fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 06:57:03 +00:00
Julian Smart
52a73e5fe8 Applied part of patch [ 774826 ] Background colour and cursor handling
Set correct background for hollow line ends


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 06:30:50 +00:00
Václav Slavík
25a5f9a9e2 use tl_PH locale instead of tl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 15:29:48 +00:00
Václav Slavík
552973e046 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 14:01:41 +00:00
David Elliott
ea3d4caf99 Add support for wxMask creation from RGBx data (x=unused)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 03:21:38 +00:00
Robin Dunn
2f4df0ecb9 Some wx.* fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 02:27:08 +00:00
Robin Dunn
3252e504a5 newevent module now returns a PyEventBinder instead of a function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 02:25:58 +00:00
Robin Dunn
8fa876ca9e Demo updates for new wx namespace, from Jeff Grimmett
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-09 01:23:28 +00:00
Václav Slavík
a61d40115f fixed wrong #ifdefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-08 22:35:42 +00:00
Julian Smart
41efa9a7cb Added 'Back' to accelerator possibilities
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-08 16:38:28 +00:00
David Elliott
ce20d822b0 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-08 15:07:25 +00:00
David Elliott
016b064360 Implement wxMask given a wxBitmap and a mask wxColour.
TODO: Masks from other sources.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-08 15:01:39 +00:00
Gilles Depeyrot
878973f1fa applied SourceForge patch # 854330 for Filedialog Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-07 21:20:35 +00:00
Gilles Depeyrot
bc93670d3b corrected Unicode conversion when replacing shared library extension with ".rsrc"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-07 21:11:49 +00:00
David Elliott
b60c6e9776 Added simple implementation of (Get|Unget)RawData.
Premultipied alpha is not handled at this point.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-06 23:27:08 +00:00
David Elliott
a28fe6d54e wxCocoa: Added wxNativePixelFormat and defined wxPIXEL_FORMAT_ALPHA
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-06 23:20:46 +00:00
Robin Dunn
f048f8290f Fixed the double traceback when an exception happens in OnInit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-05 00:40:29 +00:00
Julian Smart
83e96c90f8 Added wxWinCE project files and project file cleaner,
from "Viktor Voroshylo" <viktor@voroshylo.com>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-04 08:59:16 +00:00
Robin Dunn
423af76e39 Added reverse renamers for the *Ptr classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-04 01:17:02 +00:00
Robin Dunn
bdcf3ef53d Typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-04 01:16:03 +00:00
Robin Dunn
1f9b31fc6d Mention wxPyTypeCast
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-04 01:15:11 +00:00
David Elliott
980550fcd7 * Use sudo instead of su and enabling the root account
* Warn against installing anything into the system dirs in the first place


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 22:35:38 +00:00
Václav Slavík
9f01cb2918 unknown controls container can't be subclassed, assert if somebody tries it (as does DialogsBlock)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 14:32:51 +00:00
Robin Dunn
0f774befd1 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 04:20:49 +00:00
Robin Dunn
3fe5f176be regenned tools batch files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 04:10:28 +00:00
Robin Dunn
f098326325 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 04:07:37 +00:00
Robin Dunn
7487606ad6 reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 03:26:44 +00:00
Robin Dunn
c38400d026 Some little tweaks for debugging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 03:26:20 +00:00
Robin Dunn
e8e24dfa93 Use InheritAttributes for wxGTK widgets so they will check
ShouldInheritColours.  Set wxButton to not inherit colours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 03:24:47 +00:00
Robin Dunn
cc6dd35581 reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 01:40:34 +00:00
Robin Dunn
ed8e1ecb3f Mention that NO_FULL_REPAINT_ON_RESIZE is now the default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 01:38:53 +00:00
Robin Dunn
6a8b9da42c Add missing wxFULL_REPAINT_ON_RESIZE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 01:38:13 +00:00
Robin Dunn
0bdc5dd6f3 Give wxTimer a GetId accessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 01:37:30 +00:00
Robin Dunn
98fb9b7119 New SWIG runtime and commandline param
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 00:49:02 +00:00
Robin Dunn
1b9631c95d wxLogTrace API change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 00:44:40 +00:00
Robin Dunn
87c2245b34 Out typemap for wxString&
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 00:43:44 +00:00
Julian Smart
37b53d2a7b Patches from "Viktor Voroshylo" <viktor@voroshylo.com>
isses with context menu on real PocketPC device
static text not showing full message under WinCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-02 08:56:47 +00:00
Vadim Zeitlin
2943e582f2 added obsolescence note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 22:36:12 +00:00
Vadim Zeitlin
df945db935 updated DMC instructions for 8.38
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 20:46:20 +00:00
Vadim Zeitlin
b103e4f3d5 removed wxLogTrace() without mask to fix DMC compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 20:44:22 +00:00
Vadim Zeitlin
675fbc126a removed old copy (?) of the file which is now in build/msw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 14:05:04 +00:00
Vadim Zeitlin
0aa29b6bfb added wxRegConfig read test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 13:53:04 +00:00
Vadim Zeitlin
deadb443c6 skip event after loggig
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 13:49:17 +00:00
Vadim Zeitlin
492e2a5b07 marked FindColour() as deprecated; removed AddColour() which was only used internally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 13:41:12 +00:00
Vadim Zeitlin
89b02325bf added NULL here too (forgot to commit when added to tex2rtf.ini)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-30 13:39:31 +00:00
Dimitri Schoolwerth
56fc3fa5b3 Fixed possible usage of uninitialized variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 22:46:27 +00:00
Robin Dunn
242b7b46ad reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 18:45:05 +00:00
Robin Dunn
b227da6ad5 Changed the itemid parameter names back to id
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 18:43:48 +00:00
Robin Dunn
4da6d35e8f Expose SetClippingRegion(point, size)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 18:42:44 +00:00
Robin Dunn
c9c106fde5 Ensure that __version__ is visible from wxPython/__init__.py
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 18:40:47 +00:00
Robin Dunn
61c5a8acbe Added some aliases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 18:39:57 +00:00
Julian Smart
80a81a12af WinCE patches from "Viktor Voroshylo" <viktor@voroshylo.com>
1) to take care of ShowFullScreen.
2) will make WinCE context menu in listctrl to generate the same event as right click. WinCE does not have right click so I think it is reasonable solution for it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-28 09:19:18 +00:00
Julian Smart
44d0c580e6 Attempt to fix Borland compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 12:13:20 +00:00
Dimitri Schoolwerth
685a634c8d Fixed signed/unsigned warning (GetCount() returns size_t, not int); Slight cosmetic cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 12:09:08 +00:00
Robin Dunn
41f1cec7ae reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 01:17:54 +00:00
Robin Dunn
0df68c9ff5 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 01:06:51 +00:00
Robin Dunn
6977316f8d Updated docstring patch so that it senses multi-line docstrings and
does a proper indentation if so.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 00:53:46 +00:00
Václav Slavík
549a7c375f set m_language even when wxstd.mo wasn't loaded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 20:03:17 +00:00
Vadim Zeitlin
4bdce112bf resolved conflict (because I forgot to commit before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 20:01:54 +00:00
Dimitri Schoolwerth
5de65c6930 Declaration of CopySelection is bool instead of void.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 19:57:34 +00:00
Václav Slavík
3202d00dc9 assert if wxLocale::Init called twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 19:33:35 +00:00
Václav Slavík
eea650d869 cleanup: don't pass builtin libs includes to CPPFLAGS, it's already taken care of by the {b,m}makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 11:06:17 +00:00
Václav Slavík
85ebb95c27 fixed order of includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 11:03:41 +00:00
Robin Dunn
e6c3f9eb6a wx namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 06:11:01 +00:00
Robin Dunn
1e0c87227c More docstrings and rearrainged a couple things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 06:09:56 +00:00
Vadim Zeitlin
8feaa81f86 don't test whether m_selection is NULL both before calling CopySelection() and inside it; one time is enough
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-25 23:52:48 +00:00
Vadim Zeitlin
689c48297e fixed memory leak (m_selection wasn't deleted)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-25 23:50:10 +00:00
Robin Dunn
c7ad88ef81 Don't put the introspected argstr in the docstring if the firstline
appears to have one already.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-25 21:50:05 +00:00
Dimitri Schoolwerth
e64313babf Applied patch #809919 (Allows wxMac threads to run at fullspeed).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 20:53:35 +00:00
Robin Dunn
f39ed413b1 script to make the raw preview tarball
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 19:22:26 +00:00
Robin Dunn
a64def1139 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 19:20:14 +00:00
Robin Dunn
3b7224dc83 More Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 19:10:45 +00:00
Vadim Zeitlin
41cd03e9a8 mention wxTheApp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 18:37:32 +00:00
Robin Dunn
1fc9204a4a Fixed how the list of files is converted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 17:33:33 +00:00
Robin Dunn
d269b7df72 Fixed parameter type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 17:27:01 +00:00
Robin Dunn
dec9fa491d Fixed "" default value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 17:26:10 +00:00
Roman Rolinsky
e5e66a2de0 correct typemap type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 14:48:43 +00:00
Dimitri Schoolwerth
e128397f93 Applied patch #809019 (Adds embedded/plugin capabilities to wxMac).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-24 14:25:05 +00:00
Stefan Neis
144cf6da64 Enabled handling of drive letters on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 22:49:37 +00:00
Stefan Neis
0d853c5412 Fixed drive handling on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 22:38:30 +00:00
Stefan Neis
5a3912f2ab Fixed & improved file handling on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 22:29:46 +00:00
Stefan Neis
22e0b22bac Try to insure usability of this file in non-PM ports.
Hack to try to reduce flicker by creating controls without WS_VISIBLE
        (define WS_VISIBLE to 0).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 22:10:57 +00:00
Stefan Neis
28e5e577e4 Insure suitable choices of path/drive separator on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 22:09:14 +00:00
Stefan Neis
7d354cd1df Unified OS/2 and Unix code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 18:45:21 +00:00
Gilles Depeyrot
de127c699b applied SF patch #846738 mousewheel support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 12:06:18 +00:00
Mattia Barbon
f148f2bac3 Avoid double free in wxComboBox::SetClientObject.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 08:17:57 +00:00
Mattia Barbon
8e5ec9cc58 Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 08:16:36 +00:00
Mattia Barbon
1a6d9c7680 New wxHashTable implementation when wxUSE_STL == 1. Replaces
the old implementation based upon wxHashMap. Removed support
for wxHashTable in wxHashMap.
  Rationale: using wxHashMap for wxHashTable implementation required
special support in wxHashMap. This precluded using STL-provided
hash_map to implement wxHashMap. This new implementation does not
use keyed wxList interface and should be almost totally compatible
with the old non-STL wxHashTable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 08:12:34 +00:00
Mattia Barbon
ff9ca1fd6f Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 08:04:10 +00:00
Robin Dunn
100c45523e reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-23 01:34:16 +00:00
Robin Dunn
8a0b029bbd reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 23:26:43 +00:00
Robin Dunn
fd3f2efe79 Lots of little bug fixes, API updates, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 22:57:49 +00:00
Robin Dunn
f696721e0c Version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 22:55:43 +00:00
Vadim Zeitlin
0c7cfd990d fixed HAVE_STD_WSTRING test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 22:45:36 +00:00
Robin Dunn
3403ccd5ae Uses wxSystemSettings for colour when there is no window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 22:15:35 +00:00
Robin Dunn
6a62357c17 Forgot to remove the debug prints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 21:16:46 +00:00
Robin Dunn
fb757066df Fix problems with the wxHtmpTagHandler wrappers and related
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 21:08:20 +00:00
Mattia Barbon
4b7f540b8c Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 22:49:12 +00:00
Gilles Depeyrot
a4f5b9b9a3 applied SF patch #846732 file dialog long filename support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 21:01:03 +00:00
Robin Dunn
44127b6546 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 20:58:50 +00:00
Robin Dunn
a32360e0fb Because of some differences in class heirarchy there are a few
differences in generated code for the ogl and gizmos extensions, so
use separate dirs for them like the core does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 20:50:36 +00:00
Robin Dunn
be052e4e29 Updated the devel doc as the wxPy_newswig branch is not needed any more.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 20:37:51 +00:00
Robin Dunn
4eeb570554 Added HTML_FONT_SIZE values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 20:31:01 +00:00
Robin Dunn
80f334397a Updates for the autodoc/docstring patch, fixes overloaded functions
where one or more of them have a specific autodoc (not "0" or "1")


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 17:05:30 +00:00
Robin Dunn
7722248d75 Lots of bup fixes, API updates, etc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 07:39:05 +00:00
Robin Dunn
fbd5dd1dfa Lots of demo tweaks for API updates, bug fixes and new images for the
wxListbook demo


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 07:36:53 +00:00
Dimitri Schoolwerth
5c0ccabf02 Cosmetic cleanup (-1 -> wxID_ANY, TRUE->true).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 02:32:48 +00:00
Dimitri Schoolwerth
721b839791 Applied patch #845888 (Fixes compilation of regtest sample in Unicode/ANSI, debug/release, MSW/Univ builds of with OpenWatcom, Borland and MinGW); Cosmetic cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-21 01:54:43 +00:00
Dimitri Schoolwerth
88b98c53ac Applied patch #845884 (Fixes Unicode compilation of stc sample with Watcom).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 23:49:18 +00:00
Robin Dunn
6be0b53f3d When used from wxHtmlListBox it's possible for GetWindow to return NULL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 23:12:50 +00:00
Robin Dunn
322913cef3 More docstring updates for OUTPUT parameters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 20:41:31 +00:00
Dimitri Schoolwerth
3e778e3bde Fixed gcc compiler warning (size_t was assumed to equal an unsigned int).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 18:18:58 +00:00
Dimitri Schoolwerth
62a1177692 Applied patch #845402 ("RichEdit sample fixing and cleaning"); In addition made compilation with MSVC (nearly) warning free+some more cleaning up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 17:43:57 +00:00
Robin Dunn
6c3b4aae47 More docstrings.
Fixed wxWave compilation on Linux.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 01:19:37 +00:00
Robin Dunn
ce8f00f30c Don't run SWIG when we're doing a clean
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 01:10:20 +00:00
Dimitri Schoolwerth
ee710d75b8 Fixed repainting problems when resizing window, now using wxFULL_REPAINT_RESIZE flag (At least wxMSW and wxMac had this problem).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 22:39:52 +00:00
Julian Smart
e688defd59 Fixed WinCE compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 22:25:03 +00:00
Václav Slavík
9d814be8d0 don't define ngettext, causes problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 20:51:05 +00:00
Dimitri Schoolwerth
6b9a6d772b A few minor corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 20:11:26 +00:00
Dimitri Schoolwerth
1e1cc1ce95 Implemented missing pure virt functions (stub functions for now).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 19:29:20 +00:00
Robin Dunn
423f194a14 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 18:38:16 +00:00
Robin Dunn
9d1d5697d5 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 18:17:15 +00:00
Robin Dunn
d58a0c0392 Updated docstring patch for new SWIG CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 17:35:50 +00:00
Robin Dunn
11188b025c SWIG Runtime update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 17:32:06 +00:00
Stefan Csomor
a2825c340a XTI support for checklist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 16:30:04 +00:00
George Tasker
9af163d74d Added a parameter 'failOnDataTypeUnsupported' to getDbInfo (that defaults to TRUE keeping current functional behavior intact)), that will allow the user to override whether a call to getDbInfo() should fail immediately if a data type request reports back that it is unsupported/unavailable
fixed issues with wxDb::DBMS() that were not correctly detecting MySQL databases using MySQL v4.  also removed erroneous/duplicated code in this function that looked like a result of a bad merge at some point


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 14:50:09 +00:00
George Tasker
981cf2aadb Added a parameter 'failOnDataTypeUnsupported' to getDbInfo (that defaults to TRUE keeping current functional behavior intact)), that will allow the user to override whether a call to getDbInfo() should fail immediately if a data type request reports back that it is unsupported/unavailable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 14:44:50 +00:00
Robin Dunn
fc1fcd0edc Added accessors for m_rowHeights, m_colWidths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:42:23 +00:00
Robin Dunn
bf08dd12b4 Tests for FindItemAtPoint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:41:33 +00:00
Robin Dunn
5499dd8961 Show using GetAtter in wxPyGridTbaleBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:41:12 +00:00
Robin Dunn
d3d0f6ec7f Fix compilation error in gizmos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:39:29 +00:00
Robin Dunn
e811c8cebb reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:36:16 +00:00
Robin Dunn
dd9f7fea29 Changed all TRUE/true --> True and all FALSE/false --> False so the
Python docstrings will have the correct case.

Started adding extra docstrings where needed.

Some other little tweaks and fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:31:30 +00:00
Robin Dunn
cd303fbbc1 Correct a compile warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:28:39 +00:00
Robin Dunn
6a30d63aed SWIG patch for "autodoc" and "docstring" %features
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-19 06:27:42 +00:00
Julian Smart
eae4425db6 WinCE fixes from "Viktor Voroshylo" <viktor@voroshylo.com>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 21:25:44 +00:00
Robin Dunn
0fee8cc4fa Fixed a tex2rtf warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 21:21:05 +00:00
Robin Dunn
3ac7b44cc0 Added FindItemAtPoint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 21:20:09 +00:00
Roman Rolinsky
31f0435291 XMLID -> XRCID, Number -> GetCount, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 19:05:45 +00:00
Roman Rolinsky
fdc1a8be8f removed second parameter from GetFirstChild calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 19:04:48 +00:00
Dimitri Schoolwerth
5ea02ed5df Don't leave behind trails from glowing OS X button (By extending invisible button border).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 17:52:25 +00:00
Dimitri Schoolwerth
68f572da6e Ignore ReleaseBuild directory (Created by MSVC's "Win32 Release With Debug Info" config).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 16:54:13 +00:00
Dimitri Schoolwerth
feebe03bf2 Horizontally aligned header (Like other technotes).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 16:38:48 +00:00
Dimitri Schoolwerth
17a4e1f12f Updated translation technote to mention Makefile usage under Windows.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 16:37:11 +00:00
Robin Dunn
e1447a9737 Bugfix patch from Alberto
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-17 19:57:26 +00:00
Stefan Neis
b08c90ca63 Modified wxGetHomeDir to take environment variable HOME into account.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 22:20:41 +00:00
Stefan Neis
a85585d595 Fixed the code to actually work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 21:56:50 +00:00
Dimitri Schoolwerth
37d729ed98 wxPopupWindow was not compiled when not using pch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 20:53:10 +00:00
Václav Slavík
130711ba32 fixed wx-config together with gcc-3.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 15:13:17 +00:00
Mattia Barbon
dad6a47e6d Changes corresponding to patch #841324 from Ian Brown:
"GetPosition() returns wrong result for dialog". Moved implementation
from wxFrame to wxTopLevelWindow thus sharing it between wxFrame
and wxDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 11:28:37 +00:00
Mattia Barbon
795c00bdcc Made element layout consistent with wxMSW/wxGTK when
radiobox is wider/taller than necessary. Previously
the last element was stretched to fit remaining space.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 11:14:34 +00:00
Mattia Barbon
6746fe58b5 Applied changes corresponding to patch #840617.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-16 11:07:24 +00:00
Mattia Barbon
178edd2a32 Applied patch #840643 from Ian Brown with some modifications:
use DisplayWidth/DIsplayHeight instead of hardcoded values.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 21:12:24 +00:00
Vadim Zeitlin
2dc357ea28 expand the value of HOME env var in wxGetHomeDir() because it may contain env vars inside it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 15:42:40 +00:00
Vadim Zeitlin
c7952709e9 iconMove was incorrectly called iconCopy in ctor docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 15:08:28 +00:00
Vadim Zeitlin
f06afb9ceb IsAlive/Running() may only be used with joinable threads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 15:05:28 +00:00
Julian Smart
4c663122e4 Fixes for previous fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 10:26:46 +00:00
Dimitri Schoolwerth
f942f48def Initial revision; Ignore setup.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:50:56 +00:00
Dimitri Schoolwerth
1857c88d26 Ignore isosurf.dat.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:50:11 +00:00
Dimitri Schoolwerth
5cf036d017 Fixed Open Watcom compilation of OpenGL samples; Code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:21:10 +00:00
Dimitri Schoolwerth
9c157f38e3 Applied patch #825402 ("Fix for Unicode Open Watcom build of life demo"), second part.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 01:06:53 +00:00
Julian Smart
92d8fb5dc6 Fixes for later WinCE versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 21:06:21 +00:00
Julian Smart
4a268913a8 Corrected semaphores for WinCE >= 3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 21:04:17 +00:00
Vadim Zeitlin
aa2d9ecc3f reverted the change to the values of DEFAULT_wxUSE_XXX for the 3rd party libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 18:05:32 +00:00
Dimitri Schoolwerth
22c1c01b13 Applied patch #825402 ("Fix for Unicode Open Watcom build of life demo"); Code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 17:19:44 +00:00
Dimitri Schoolwerth
9f55ceabf4 Include wx/file.h in case previous includes don't do it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 15:33:30 +00:00
Dimitri Schoolwerth
abe89c8acb Applied patch #827025 (Removes last warnings from emulator util); Cosmetic cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 13:55:06 +00:00
Dimitri Schoolwerth
b8add85e9d Ignore Watcom build directory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 13:23:52 +00:00
Dimitri Schoolwerth
0b3fcc0a59 Fixed wxUniv+OpenGL compilation for MSW; Cosmetic cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 12:59:03 +00:00
Dimitri Schoolwerth
e11f46363f Fixed Digital Mars compilation; Cosmetic cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-14 12:55:25 +00:00
Robin Dunn
94d33c49d1 Removed %noautorepr directives
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 18:43:39 +00:00
Robin Dunn
5434ebd693 Recent changes in SWIG make this patch no longer necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 18:42:38 +00:00
David Elliott
9de2e75ad0 wxCocoa: Use the new native MDI implementation instead of generic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 16:05:24 +00:00
David Elliott
f99422e9e9 Added implementation of MDI using top level windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 16:03:08 +00:00
David Elliott
3905012063 Added a mechanism allowing a toplevel window to delay its deactivation
event.  This will come in handy for MDI among other things.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 15:13:55 +00:00
David Elliott
9f13cca8f6 Very lame fix for windows with -1 for a component of position or size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 14:33:30 +00:00
David Elliott
46cdffaf79 Fix file header and remove unused include "wx/cocoa/mbarman.h"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 14:28:53 +00:00
David Elliott
243f5c2d91 Renamed UpdateWindowMenuBar to UpdateMenuBar and removed unused parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-13 14:23:07 +00:00
Robin Dunn
d14a1e2856 Merged the wxPy_newswig branch into the HEAD branch (main trunk)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-12 21:34:20 +00:00
Václav Slavík
eb6a4098a0 Always set background colour prior to any HTML rendering (this fixes assert in GTK2 build because BgColor of wxHtmlRenderingState was unset=invalid)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-11 13:19:57 +00:00
Václav Slavík
e77fbecf59 part of DS' change _was_ corrent, restored
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-11 12:35:24 +00:00
Dimitri Schoolwerth
335d757931 Really fixed Borland release build warning (without sabotaging code this time).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 17:32:04 +00:00
Václav Slavík
b5d464b982 previous DS' change was broken, reverted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 15:49:46 +00:00
Václav Slavík
50b24bf9dd added test for CDATA handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 15:49:08 +00:00
Dimitri Schoolwerth
8703bc01c2 Added wxUnusedVar for Borland and fixed 2 release mode warnings for Borland (patch #835707); Slight code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 15:17:46 +00:00
Václav Slavík
cd32c91a3e bakefile cleanup: use consistent way of setting lists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 13:46:12 +00:00
Václav Slavík
576702191b fixed msvc6prj - missing oleacc library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 12:47:46 +00:00
Václav Slavík
5532b1459c added bakefile's new tag <objects-depend>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 12:46:41 +00:00
Julian Smart
ff31aff926 Removed MGL_ROOT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 10:08:49 +00:00
Mattia Barbon
4cbb46c912 Fix after last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 21:43:34 +00:00
Mattia Barbon
8552e6f031 Warning fixes and deprecated method elimination from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 21:40:34 +00:00
Václav Slavík
6937991694 addedd support for <pre width=...>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 13:59:50 +00:00
Václav Slavík
4d312c222e fixed wxConvLocal to work with C locale (and probably some others)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 12:27:42 +00:00
Václav Slavík
a58d4f4d49 prevent deadlock in wxCSConv::DoCreate if it fails for wxConvLocal -- ugly but works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 12:09:13 +00:00
Dimitri Schoolwerth
0e2710a6b9 Fixed MSVC warnings from Win32 Unicode Release build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 19:40:29 +00:00
Stefan Neis
20c8441047 Allow minimal acceptable row height/column width to be set to 0 for
hiding rows/columns.
Only return true from CanEnableCellControl if a valid cell is selected
        (fixing Bug #837656).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 18:58:04 +00:00
Stefan Neis
737928c244 Avoid referencing WinInitialize/Finalize for non-PM builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 18:52:53 +00:00
Mattia Barbon
461932ae60 wxXRC STL-ification.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 18:48:47 +00:00
Mattia Barbon
671d21303f Compilation fix for !WXWN_COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 18:45:01 +00:00
Vadim Zeitlin
93a543aa72 add -lXpm to the GUI libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 15:40:56 +00:00
Vadim Zeitlin
72858fcf67 added comments to the makefile; added WX_CONFIG var to be able to use a different wx-config easily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 15:16:38 +00:00
Vadim Zeitlin
89fe663f93 1. fixed --with-libxpm switch handling, added it to the summary
2. show toolkit name in lower case in the summary
3. changed defaults for all external libraries to "sys", didn't we
   agree to do this some long, long time ago?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 15:06:15 +00:00
Vadim Zeitlin
aa961a511e restored double square brackets for now, my last fix was wrong
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 14:10:03 +00:00
Vadim Zeitlin
01b18927f5 fix for previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 13:09:10 +00:00
Vadim Zeitlin
c8818622b7 use [A-Z] instead of [[A-Z]] in tr (replaces patch 838397)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 12:43:22 +00:00
Vadim Zeitlin
cd318cd31b removed assert which became incorrect after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 12:28:48 +00:00
Václav Slavík
e884cfe27d build_cfg_file is phony target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-08 10:31:36 +00:00
Robin Dunn
3ff632ce66 Fixed an accidental name clash, and added back a wxCHECK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 20:52:35 +00:00
Robin Dunn
6c1ad2a8e6 A little narrower initial layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 19:33:25 +00:00
Robin Dunn
6217b9aa7e Set m_rows, m_cols so GetRows/GetCols in the base class work. Added
GetCellSize method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 17:45:10 +00:00
Vadim Zeitlin
2825b3f502 fix for infinite loop in wxFileConfig when reading from input stream fails (patch 837134)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 11:42:23 +00:00
Vadim Zeitlin
36ebb50aa3 fixed bug with looking beyond the end of string in ConvertStringToArgs() (patch 828609)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 11:34:39 +00:00
Stefan Csomor
ffcd519515 after rearrangement to-Page got lost
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 10:23:13 +00:00
Robin Dunn
ea0d8ca6e8 Forgot to change the pos and span names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 08:30:58 +00:00
Robin Dunn
0d077b41ee Refactored wxSizerXmlHandler and added support for wxGridBagSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 08:27:41 +00:00
Robin Dunn
d2eaa86b9e Fixed warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 08:07:42 +00:00
Robin Dunn
1b52f7aba0 Added default ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 07:05:39 +00:00
Robin Dunn
1621c234d1 Calling sizerItem->SetWindow shoudl set the minsize too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 07:04:55 +00:00
Václav Slavík
b22179c0b9 moved build.cfg to setup.h directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 23:52:01 +00:00
Václav Slavík
16840c7f55 moved build.cfg to setup.h directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 23:44:26 +00:00
David Elliott
8ded703ddc Add wxCocoaNSWindow* parameter to GetAppMenuBar so implementations can
return an alternate menubar based on the window which needs it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 20:37:16 +00:00
David Elliott
f1d04a42d5 * Removed CocoaInternalIdle()
* Removed methods that were called by wxTopLevelWindow notification handlers
* Removed now useless m_needMenuBar
* Added an Objective-C notification observer class
* Added methods to receive the notifications
* InstallMenuBarForWindow now takes a wxCocoaNSWindow
* Do not keep track of key/main window
* Keep track of window for which menu bar was installed (m_windowCurrent)
* SetMenuBar() will now install the main menu immediately


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 20:12:11 +00:00
David Elliott
a381cfaa2d Don't pass notifications to wxMenuBarManager. It will be getting its own.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 20:04:24 +00:00
David Elliott
96c36a9310 Don't call wxMenuBarManager::CocoaInternalIdle(). It is about to be removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 20:02:32 +00:00
David Elliott
360be3c012 Add virtual wxMenuBar* GetAppMenuBar();
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 19:53:31 +00:00
Vadim Zeitlin
6d78bbe637 fixed vertical scrollbar handling (broken by some relatively recent but unknown precisely change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 19:41:46 +00:00
Vadim Zeitlin
07bf769ead update list ctrl size after recreating it (when the mode changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 19:28:24 +00:00
David Elliott
3e84f98ffa wxMenuBarManager::InstallMenuBarForWindow no longer looks for a menubar
attached to the parent of a window without one.  Instead, it is now up to
the GetAppMenuBar() function to do so.  The new implementation in
wxTopLevelWindow does just that.  The wxFrame implementation now calls
the base class version if it does not have a menubar.  Also, it is now
invalid to call the function with a NULL window (it is internal anyway).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 19:25:06 +00:00
Robin Dunn
77c5e9230e Tweaked the layout sample a bit for wxGridBagSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:53:45 +00:00
David Elliott
9fa453eca5 Include mondrian.xpm for _all_ platforms except wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:36:49 +00:00
David Elliott
6ceba1749e Wrap ToolBar stuff with #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:33:09 +00:00
David Elliott
ee2f6a9353 Wrap some toolbar code in #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:22:27 +00:00
David Elliott
7424a6375b Changed Command to ProcessCommand
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:14:39 +00:00
David Elliott
aa6f64c7d8 Replaced all occurences of id with winid for Objective-C++ compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:09:48 +00:00
Julian Smart
46c81560de Removed some old doc targets
Fixed doc typos
No longer convert OS/2 files to lower case


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 15:21:40 +00:00
Robin Dunn
20b35a6916 Added wxGridBagSizer, a grid sizer where item positions can be
specified and row/col spanning is allowed.

Updated docs, the layout sample, files.bkl, and updated makefiles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 01:31:44 +00:00
Václav Slavík
5d1000e7f1 generate build.cfg file on Windows, with information about settings used to build the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 23:33:24 +00:00
Václav Slavík
b231f9594e fixed wrong format names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 22:53:36 +00:00
Dimitri Schoolwerth
fb4d5ecdc5 Fixed bug introduced by previous commit (Swapped if/else order).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 16:10:32 +00:00
Dimitri Schoolwerth
66026c5c18 Ignore Borland build directory; Ignore 3 .lib files generated by DigitalMars.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 15:46:58 +00:00
David Elliott
372208c2e6 Use a lowercase 'q' for the Quit menu item's keyEquivalent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-04 20:00:37 +00:00
David Elliott
6e09ff550a Removed call to InitBase() from wxWindowCocoa::Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-04 19:45:59 +00:00
Dimitri Schoolwerth
52410d542e Removed usage of deprecated methods (patch #827023); Slight code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-04 13:16:32 +00:00
Dimitri Schoolwerth
3ac41bc10c Ignore expat*.lib files and vc_lib directory which are created during build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-04 12:21:26 +00:00
Dimitri Schoolwerth
e41e579f40 wxWindowsPrinter::Print ignored the "All pages" option, instead it was using the (invalid) from-to range (patch #835254); Slight code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-04 09:22:28 +00:00
Stefan Neis
53e8757b65 Added some bad hacks to make region processing work at least a bit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-03 01:20:15 +00:00
Mattia Barbon
7e91413a02 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:40:21 +00:00
Mattia Barbon
044bbeb0b7 Fix (correct) warning about potentially uninitialized variables.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:39:01 +00:00
Mattia Barbon
094112e92e Compilation fix for wxUSE_STL==1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:37:49 +00:00
Mattia Barbon
d366db969f Updated changes.txt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:36:13 +00:00
Mattia Barbon
dabf1d079b Updated not to use deprecated wxList methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:34:11 +00:00
Mattia Barbon
7057f62a37 Updated wxHashTable::Next documentation to use wxHashTable::Node*
for the return type (which currently is just a typedef for wxNode*).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-02 15:32:24 +00:00
Václav Slavík
49462b9b65 standardize configure flags in RPMs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-01 18:58:51 +00:00
Vadim Zeitlin
96fcf4d86c update from Tsolakos Stavros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-01 18:30:37 +00:00
Vadim Zeitlin
4cc6a9db04 compilation fix for VC++ statis MT build with wxUSE_STL==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-01 12:17:29 +00:00
Vadim Zeitlin
9c72ebec90 don't show hidden child frames when the parent is restored
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-01 09:28:44 +00:00
Václav Slavík
0dd6c07178 add upper-case extensions to fallbac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 19:51:03 +00:00
Václav Slavík
89d38f8c3a added resolution option to JPEG handler (patch #833234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 15:58:58 +00:00
Vadim Zeitlin
150018aebb warning about VC++ /ZI option and wxCOMPILE_TIME_ASSERT added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 15:17:59 +00:00
Václav Slavík
1a97976a45 don't use deprecated symbols
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 15:16:25 +00:00
Vadim Zeitlin
dfcb9d7caf updated SendIdleEvent() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 14:27:56 +00:00
Vadim Zeitlin
1074721428 removed InitBase()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 14:11:41 +00:00
Vadim Zeitlin
06f6df7d46 removed InitBase()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 13:26:59 +00:00
Robin Dunn
39c0acb666 Patch #826420, and also adapted to new SWIG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-31 01:12:25 +00:00
Vadim Zeitlin
727953356d removed calls to wxWindowBase::InitBase(), it is called from the ctor anyhow (and so was called twice)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-30 23:08:39 +00:00
Václav Slavík
8ccff7d211 #if around deprecated macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-30 22:26:29 +00:00
Vadim Zeitlin
5031200a24 added missing _T()s in wxLogTraces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-30 22:15:57 +00:00
Vadim Zeitlin
b45d3a5dd3 update from Vegh Janos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-29 22:59:37 +00:00
Vadim Zeitlin
cc322b2cd5 changed case of the cursor names to be consistent with wx.rc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-29 22:44:44 +00:00
Robin Dunn
af17155e90 Added SetMin/SetMax
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-29 04:28:53 +00:00
Robin Dunn
863e83fa43 Fixed compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-29 02:42:29 +00:00
Václav Slavík
7f523214e5 use -headerpad_max_install_names when linking shared libs on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-28 23:22:26 +00:00
Vadim Zeitlin
86a7257f11 don't give error msg when deleting non existing keys neither (part of patch 830049)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-28 10:55:05 +00:00
George Tasker
5356f74c4c Added examples of an INSERT and a DELETE to the sample application that is part of the overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 23:43:54 +00:00
Vadim Zeitlin
45df080916 really applied Robert's patch (and not the converse of it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 21:41:53 +00:00
Vadim Zeitlin
c66c3af135 removed virtual from functions which are not; expanded wxWindow description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 12:36:29 +00:00
Vadim Zeitlin
c3558af510 wxFileExists() returns false for directories (bug 825507)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 11:02:12 +00:00
Stefan Neis
0b483d6eef Initialize m_lNumRects to avoid core dumps if GpiQueryRegionRects fails.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 08:04:25 +00:00
David Elliott
921176c5e4 Changed all symbols with the name "id" to "winid" to allow Objective-C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 04:12:45 +00:00
David Elliott
b935bec236 Changed all symbols with the name "id" to "winid" to allow Objective-C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 03:47:39 +00:00
David Elliott
c5c5dad595 Changed all symbols with the name "id" to "timerid" to allow Objective-C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 03:42:30 +00:00
Václav Slavík
d642247352 ignore Bakefiles.local.bkgen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-26 20:47:14 +00:00
Václav Slavík
328f5196bb added C++BuilderX support (disabled by default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-26 20:45:27 +00:00
Mattia Barbon
3d08c0e77d Darwin compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-26 17:55:04 +00:00
Stefan Neis
72a0a2de1e Fixed update rectangle passed to WinInvalidateRect in wxWindowOS2::Refresh().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-26 16:11:20 +00:00
Václav Slavík
9d0be83a37 fixed sed command on solaris (bug #830138)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-25 19:53:45 +00:00
Mattia Barbon
659f8ec331 More NO_PTR -> PTR compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-25 08:52:23 +00:00
Robin Dunn
0eedee0466 fixed placement of pythonnote
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 22:35:18 +00:00
Vadim Zeitlin
c547282d5e use iconv() for wxCSConv constructed from a wxFontEncoding; don't use wxFontMapper unless really needed; when it is used, don't use it interactively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 21:50:00 +00:00
Mattia Barbon
878d055d0b Match changes in DECLARE_*_CLASS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 21:28:56 +00:00
Vadim Zeitlin
a3f7fa6267 compilation fix for some Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 20:12:07 +00:00
Vadim Zeitlin
e4a8a17202 fixed crash on startup under GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 20:08:12 +00:00
Václav Slavík
246428310e fixed iso-8859-1 handling to report failures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 19:25:48 +00:00
Václav Slavík
c7c0629157 fixed crash if szLocale==NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-24 09:32:29 +00:00
Mattia Barbon
14630825ef Until configure and aclocal.m4 are in CVS they should not
be in .cvsignore.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 22:19:32 +00:00
Mattia Barbon
b2b9de21cb Make both GCC and MSVC 5 happy.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 21:58:22 +00:00
Mattia Barbon
9f8b329b8c wxMac linking fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 21:51:33 +00:00
Mattia Barbon
c0a83c519b Suboptimal wxColour::CreateByName implementation for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 21:49:44 +00:00
Mattia Barbon
38d6b9572c Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 21:38:31 +00:00
Stefan Csomor
ffd82f1cf8 fix for gcc MacOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 17:46:04 +00:00
Vadim Zeitlin
07e9d4f0ed don't refresh the font unnecessarily (patch from Robert Vazan)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 16:48:45 +00:00
Vadim Zeitlin
94a09ea5d3 don't crash on startup (fix for last change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 12:09:04 +00:00
Vadim Zeitlin
a182a91391 removed a printf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-23 11:28:36 +00:00
Robin Dunn
c85417f629 Added SetColumnCount method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 23:29:54 +00:00
Vadim Zeitlin
93b79b6b57 don't append spaces to all arguments in ConvertStringToArgs()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 21:40:04 +00:00
Vadim Zeitlin
63e7198ba8 moved wxUSE_UNICODE <-> _UNICODE checks to wx/platform.h from wx/wxchar.h because wxUSE_UNICODE is used in wx/defs.h itself, before wx/wxchar.h is included
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 21:24:16 +00:00
Mattia Barbon
753287c1fd Compilation and warning fixes for GCC 3.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 20:54:50 +00:00
Mattia Barbon
63407846da Fixed condition not to be always false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 20:30:59 +00:00
Mattia Barbon
33eab53044 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 20:22:58 +00:00
Robin Dunn
abbc257086 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:40:36 +00:00
Robin Dunn
2f4811fcbd reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:30:01 +00:00
Robin Dunn
6fa68946ec Add sample showing how to use the XRC subclass attribute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:25:20 +00:00
Robin Dunn
098d1f0c65 Save the initial tstate during initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:23:36 +00:00
Robin Dunn
b434e3f098 Updates for wxColourDatabase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:21:47 +00:00
Stefan Csomor
be6628ce35 string conversion bug fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:10:20 +00:00
Stefan Csomor
46e2a2e7f6 fix for unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 17:08:54 +00:00
Václav Slavík
3a858e7512 include wx/platform, to get __WINDOWS__ etc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 14:46:57 +00:00
Vadim Zeitlin
4e9d23cdae account for parent area origin when creating controls and windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 08:43:28 +00:00
Vadim Zeitlin
949b8e6284 moved text creation after tbar creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 08:41:36 +00:00
Vadim Zeitlin
716e96df2b added default value (0) for flags argument of AdjustForParentClientOrigin()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 08:33:32 +00:00
Vadim Zeitlin
bfdc04a9bb mention ShouldInheritColours() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 08:27:57 +00:00
Vadim Zeitlin
201542cdd7 regen'd after adding wx/dlimpexp.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 08:12:30 +00:00
Vadim Zeitlin
e4bfb5c0cd removed duplicate yellow green from colour database
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 07:49:45 +00:00
Stefan Csomor
f4ef67ba69 adding support for mach unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-22 06:46:48 +00:00
Vadim Zeitlin
c1ef87c33d don't allocate system fonts/colours dynamically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 23:30:03 +00:00
Vadim Zeitlin
f49d731fd4 fix for wxDateTime::SetToYearDay(last month day) (bug 816065)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 23:00:37 +00:00
Vadim Zeitlin
034742fcd6 fix for mistakenly prepending slash to the filenames without paths (bug introduced by last check in)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 22:45:28 +00:00
Vadim Zeitlin
2a36ad637f generate trace messages with dialup mask so that they're not shown by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 21:34:56 +00:00
Gilles Depeyrot
33f39af3b0 applied SF patch # 826838 to fix removal of -psn_* command line argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 20:22:34 +00:00
Václav Slavík
c2149c93d5 wxUSE_GUI=0 not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 14:05:45 +00:00
Václav Slavík
1315b91d84 more supressed warnings for bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 13:14:07 +00:00
Vadim Zeitlin
289307fa14 free the DIB for raw bitmaps even if they don't use alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-21 12:51:50 +00:00
Vadim Zeitlin
26dddf6c34 Open Watcom doesn't like typename, use class (patch 826812)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-20 17:43:08 +00:00
Stefan Csomor
2c4c398782 VC6 template fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-19 13:41:33 +00:00
Mattia Barbon
728b21e56c MSVC 5 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-19 09:10:20 +00:00
Mattia Barbon
fa7161e09f Added some wxPerl notes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-19 09:09:12 +00:00
Vadim Zeitlin
564a150b1f replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:51:01 +00:00
Vadim Zeitlin
5d398dbae0 documented wxColourDatabase::FindColour() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:46:19 +00:00
Vadim Zeitlin
45bbbc5430 use #if WXWIN_COMPAT and not #ifdef (patch 826160)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:22:11 +00:00
Vadim Zeitlin
f75aecd00f use wxColourDatabase::Find() instead of deprecated FindColour(); some minor code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:20:13 +00:00
Robert Roebling
f9ebac93e7 Further corrections to bitmap and blit code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 19:23:19 +00:00
Václav Slavík
7d88f0992a DMC make.exe can handle include directive, even though it is not documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 11:34:30 +00:00
Robin Dunn
b7d681eb04 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 05:47:22 +00:00
Robin Dunn
025fa9a96b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:56:15 +00:00
Robin Dunn
900eb07b48 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:36:23 +00:00
Robin Dunn
40f5c32cbd New version from Timothy Hochberg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:33:35 +00:00
Robin Dunn
81744507e8 Added TODO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:33:02 +00:00
Robin Dunn
3b6d8c19fc Added IsEditCancelled/SetEditCanceled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:32:41 +00:00
Robin Dunn
118f4724b6 Demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:31:26 +00:00
Robin Dunn
7ca4c2e1eb Added note about migration guide
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:30:10 +00:00
Robin Dunn
88c32d58d8 typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 04:29:53 +00:00
Stefan Csomor
05fa251a2f adjusting to changes in xti.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 19:53:19 +00:00
Stefan Csomor
bb7eff4c0d adjusting to changes in object.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 19:50:46 +00:00
Stefan Csomor
c9cacf3e49 removing RTTI classinfo #define redirections, not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 19:48:20 +00:00
Vadim Zeitlin
4e6b83091a added CreateByName(), use it in wxColourDatabase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 17:39:28 +00:00
Robert Roebling
551b5391ae \
Updated bitmap blitting code as per 2_4


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 14:28:52 +00:00
Václav Slavík
a2e268df19 samples.inc is not data file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 11:20:25 +00:00
Jouk Jansen
2b5b100ac6 Committing in .
OpenVMS updates

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/defs.h
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-17 10:01:21 +00:00
Vadim Zeitlin
c50f92d08c fixed bug with wxcolourDatabase::FindColour(); added (and documented) new Find() and AddColour(const wxColour&) methods to avoid such problems in the future
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 17:42:31 +00:00
Vadim Zeitlin
9551b6fe2f added \NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 17:38:15 +00:00
Vadim Zeitlin
5b66d31a94 fixed wxMouseEvent::Moving() and Dragging() after the last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 15:05:32 +00:00
Vadim Zeitlin
c0db962623 made wxRTTI macros namespace-friendly (patch 799434)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 11:33:46 +00:00
Vadim Zeitlin
311ccb86e4 compilation fix for Watcom (part of patch 813225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 11:23:07 +00:00
Vadim Zeitlin
3cb9989457 added wxSYS_ICONTITLE_FONT (patch 816026)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 11:17:38 +00:00
Vadim Zeitlin
84968677ab VC++ release mode warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 11:09:11 +00:00
Václav Slavík
7d2681a303 Vadim moved the macros to dlimpexp.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 11:02:30 +00:00
Vadim Zeitlin
489bbac963 RemoveEventHandler() didn't reset all pointers correctly (patch 819545)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:31:19 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +00:00
Vadim Zeitlin
0cc66b6c0b moved DLL import/export declarations from wx/defs.h to (new) wx/dlimpexp.h for GSocket; added wxUnusedVar() and wxDUMMY_INITIALIZE() to wx/defs.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:25:56 +00:00
Vadim Zeitlin
d4864e971b added ShouldInheritColours()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:00:12 +00:00
Vadim Zeitlin
81b344a543 use ShouldInheritColours() instead of IsContainerWindow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:39:22 +00:00
Vadim Zeitlin
230205aec5 use ShouldInheritColours()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:38:04 +00:00
Vadim Zeitlin
cb820f8075 don't complain if file doesn't exist in DeleteFile(); do return false if it exists and we failed to delete it (patch 819530)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:19:21 +00:00
Vadim Zeitlin
edceb27c5e removed a string from contrib (Scintilla)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:15:10 +00:00
Vadim Zeitlin
7a1e00a16b added missing wxCMPFUNC_CONVs (patch 817551)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:12:36 +00:00
Vadim Zeitlin
3931863650 added missing wxCMPFUNC_CONVs (patch 820862)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:10:44 +00:00
Vadim Zeitlin
64dcc26913 use correct fallback file name in SaveFile() (patch 820884)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:05:54 +00:00
Vadim Zeitlin
6a172d5942 finished Japanese translations (patch 824608)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 08:57:03 +00:00
Vadim Zeitlin
f8a0822bc5 some cosmetic fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 08:51:16 +00:00
Vadim Zeitlin
7230716d7a patch 816178 and tons of other fixes to owner drawn bitmaps appearance; some code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 08:50:20 +00:00
Vadim Zeitlin
6f63704ff4 wxMouseEvent::Moving() shouldn't return true when we're really dragging the mouse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 07:55:25 +00:00
Vadim Zeitlin
8a7dfb14a2 added EVT_WIZARD_FINISHED handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 07:23:58 +00:00
Vadim Zeitlin
64c2fa134b send EVT_WIZARD_FINISHED for modal wizards as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 07:22:19 +00:00
Vadim Zeitlin
5cb4253ec2 update the selection properly after deleting the page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-15 22:59:36 +00:00
Vadim Zeitlin
f4992e37c0 removed the weird m_style which was never initialized GTK and duplicated m_windowStyle under Mac/MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-15 22:45:23 +00:00
Stefan Csomor
de0bc93298 bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-15 19:23:52 +00:00
Vadim Zeitlin
7a1f9c0911 attempt to split cmd line into words in the same way as Windows does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-14 22:58:09 +00:00
Mattia Barbon
ecb9c007bd wxMotif fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-14 17:27:59 +00:00
Mattia Barbon
833a51f67e Implemented wxPopupWindow for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-14 17:05:28 +00:00
Václav Slavík
58b2e303b1 nicer tick and fixed home icons (patch #820767)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-14 07:30:08 +00:00
Vadim Zeitlin
2197563c78 oops, compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 23:49:18 +00:00
Vadim Zeitlin
5bc97d1b81 added CanConvert()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 23:47:22 +00:00
Vadim Zeitlin
19da49fcd0 show the selected item with customs colour correctly when the control doesn't have focus (i.e. don't keep the selected background)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 23:38:53 +00:00
Václav Slavík
9e3b313e79 gettext plural form docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 21:37:02 +00:00
Václav Slavík
4c3590e409 use ngettext instead of _N
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 21:29:20 +00:00
Václav Slavík
ba9d03fa13 1) use ngettext instead of _N, 2) cleanup of gettext macros definitions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 21:27:02 +00:00
Mattia Barbon
fe8d146972 wxMotif now uses wxGLCanvas implementation from wxX11,
removed unused files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 17:28:15 +00:00
Mattia Barbon
f15b55cee0 Fixes for application not closing after last top level
window closed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 17:23:23 +00:00
Mattia Barbon
7f2e78ed5d Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 17:21:30 +00:00
Václav Slavík
f9d243a306 fixed double filename->URL conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-13 09:56:30 +00:00
Václav Slavík
18aeafcbc0 supported platforms update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 13:24:35 +00:00
Vadim Zeitlin
54759554d3 use LVSICF_NOINVALIDATEALL in SetItemCount() to reduce flicker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 11:19:18 +00:00
Vadim Zeitlin
6ee654b36c added LVSICF_NOINVALIDATEALL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 11:17:51 +00:00
Mattia Barbon
65eb5b0b0b Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 09:24:55 +00:00
Mattia Barbon
1772d1129f Try to use the correct make.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 08:56:07 +00:00
Vadim Zeitlin
a509f83054 VC++ release mode warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 01:46:17 +00:00
Vadim Zeitlin
b26613c25b fixed conversion from Unicode in StreamOut() once again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 01:23:23 +00:00
Robin Dunn
f4cf4fdab2 Patch #821454
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-11 01:20:24 +00:00
Vadim Zeitlin
983736252c another Unicode compilation fix for !wxUSE_ENHMETAFILE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 20:22:11 +00:00
Robin Dunn
c43270050e removed #!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 16:11:25 +00:00
Václav Slavík
d614f51b31 return false from wxXmlResource::Load if the resource is corrupted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 09:48:52 +00:00
Julian Smart
120249f602 Don't set insertion point if the text is the same in SetValue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 08:21:08 +00:00
Stefan Csomor
8aa701edbb newlines conversions streamlined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-10 04:26:45 +00:00
Vadim Zeitlin
8534ba3428 Unicode compilation fix for !wxUSE_ENHMETAFILE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 22:21:28 +00:00
Robert Roebling
d90c9596c1 Applied new DoDrawBitmap() and DoBlit() from 2_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 20:03:17 +00:00
Robert Roebling
783da8450c Added wxBitmap::Rescale() from 2_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 20:01:49 +00:00
Robert Roebling
9fe7d43031 image sample fix from 2_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 20:00:22 +00:00
Stefan Csomor
be3dfc5dfa added newline conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 18:19:45 +00:00
David Elliott
59d6b6a928 Added lengthy comment detailing the implications of idle handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 15:59:37 +00:00
David Elliott
9670dfc4be Prevent Cocoa from waiting indefinitely when stopping the event loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 15:56:38 +00:00
Václav Slavík
1cc75a7981 fixed too small pagesize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 15:16:58 +00:00
Václav Slavík
e6e885fd54 beginnings of DigitalMars support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 12:47:09 +00:00
Vadim Zeitlin
f7550d7322 fix for showing a modal dialog from OnIdle() when another modal dialog is being destroyed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-09 08:52:40 +00:00
Vadim Zeitlin
c1f6530541 backport wxRegConfig enumeration fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 23:37:24 +00:00
Vadim Zeitlin
72957aa3ba fixed enumerating of entries/groups under '/' in wxRegConfig
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 23:36:11 +00:00
Vadim Zeitlin
05e1201cb5 wxFileName::Normalize(wxPATH_NORM_ENV_VARS) now works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 23:22:00 +00:00
Vadim Zeitlin
5bb9aeb266 check directories passed to Append/Insert/PrependDir(); don't terminate string returned from GetPath() with wxPATH_GET_SEPARATOR flag with slash for the paths which don't have any path at all under DOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 23:15:16 +00:00
Vadim Zeitlin
1cc603c152 documented _PTR versions of WX_DEFINE_ARRAY macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 22:16:39 +00:00
Vadim Zeitlin
d5d29b8a22 renamed WX_DEFINE_ARRAY_NO_PTR in WX_DEFINE_ARRAY_PTR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 22:13:14 +00:00
David Elliott
72ae85dd61 Implement Pending and Dispatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-08 15:51:40 +00:00
Vadim Zeitlin
3b60c67b97 don't always create MDI children with WS_THICKFRAME (only if wxRESIZE_BORDER is given)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 23:07:47 +00:00
Vadim Zeitlin
06110b0006 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 23:06:16 +00:00
Vadim Zeitlin
7b92350b2e restore status bar text after a menu has been shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 23:04:44 +00:00
Vadim Zeitlin
96ac065f9e restore status bar text after a menu has been shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 22:55:06 +00:00
Václav Slavík
e1a098d1ec fixed bakefile so that in-tree headers take precedence over system-installed ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 21:37:54 +00:00
Václav Slavík
4bc89de684 added .chm support for Unix (Markus Sinner) -- regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 20:20:53 +00:00
Václav Slavík
3527f29c87 added .chm support for Unix (Markus Sinner)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 20:15:27 +00:00
Václav Slavík
c839485c8e added .chm support for Unix (Markus Sinner)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 19:47:02 +00:00
Vadim Zeitlin
d7787243db fixed FixedSizeTabs()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 13:37:43 +00:00
David Elliott
18dd54e3fd wxListMainWindow::OnRenameCancelled(): itemEdit parameter is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 13:20:30 +00:00
Vadim Zeitlin
1bf37bf5b1 added test for cancelled END_EDIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 09:06:58 +00:00
Vadim Zeitlin
d2ed74b912 send END_EDIT label if label editing is cancelled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 08:41:54 +00:00
David Elliott
9692f42bc6 Use NSWindow delegate notification windowWillClose instead of overriding close
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 19:17:11 +00:00
Václav Slavík
88e3652fd0 remove wxBase files to get rid of RPM's complains about unpackaged files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 19:12:12 +00:00
David Elliott
c1f12896c2 * Add bool parameter to WindowDidResignKey indicating whether the menu bar
should be changed to the common menubar or remain installed.
* Add back some assertions to ensure the code is working as intended.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 18:54:59 +00:00
Robert Roebling
a912c1849d Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 18:43:45 +00:00
Robert Roebling
34b5e560a9 Implemented wxChoice::SetString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 18:09:20 +00:00
David Elliott
ba808e2412 Moved wxCocoa specific doIdle method to application delegate object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 17:12:43 +00:00
Robin Dunn
b01fc8925f Show how to get the right position for HitTest from a mouse event position
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 16:53:31 +00:00
Robert Roebling
0d2bf8bf45 Fixed bitmap problem reported last week.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 15:59:54 +00:00
David Elliott
0187ddb4a8 Use an application delegate object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 15:36:11 +00:00
David Elliott
2990ec973f Always return NO for applicationShouldTerminateAfterLastWindowClosed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-06 15:14:11 +00:00
Vadim Zeitlin
70247ce395 instead of ignoring all unknown MIME keywords, ignore only those not starting with x- (this was always the intended effect but it didn't work like this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-05 19:27:26 +00:00
Vadim Zeitlin
8c4b73d1c9 removed extra virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-05 15:18:45 +00:00
Stefan Neis
e496cfc5bf Fix to detection of gcc version on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-05 12:49:13 +00:00
Stefan Neis
e4f1a68ad1 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-05 12:36:59 +00:00
Václav Slavík
8be1c2c5b2 don't build the GUI version of tex2rtf wif --disable-gui
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:44:22 +00:00
Václav Slavík
6f80247a06 added gettext plural forms support (patch #785660 with modifications)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:43:46 +00:00
Václav Slavík
2bf8cafb21 tex2rtf builds in wxBase, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:43:01 +00:00
Václav Slavík
ba22024719 added Czech translation to the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:42:06 +00:00
Václav Slavík
857d30ca42 copy catalogs to builddir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:39:07 +00:00
Václav Slavík
849a28d0da added gettext plural forms support (patch #785660 with modifications)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 22:38:00 +00:00
Václav Slavík
1e618fa683 fixed misgenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 17:57:33 +00:00
Václav Slavík
a4ad36cdc5 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 13:49:34 +00:00
Václav Slavík
0e2ff61207 regenerated with DESTDIR fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 09:10:20 +00:00
Stefan Csomor
fa9f937f05 applied bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 08:26:05 +00:00
Robin Dunn
487f2d58e9 Add some WXDLLIMPEXP's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 03:00:46 +00:00
Vadim Zeitlin
52a9e32988 fixed inconsistencies with indices in wxTE_RICH2 controls (remove CRs when streaming text out now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 00:21:54 +00:00
Vadim Zeitlin
626117f778 fixed horrible flicker and 100 CPU usage (text ctrl was being updated all the time)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 00:19:35 +00:00
Vadim Zeitlin
3e89999c1a fixed wxMOUSE_BTN_XXX values, use them instead of hard coded constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 22:22:59 +00:00
Robin Dunn
851d4ac7fa Added more meta-data for PyPi
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 19:51:12 +00:00
Václav Slavík
6c24d95cf9 fixed memory leak (#817324)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 18:30:38 +00:00
Stefan Neis
72bfca58d9 Fixed usage of uninitialized variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 17:03:52 +00:00
Stefan Neis
d00110f640 Fixed typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 17:01:06 +00:00
Stefan Neis
7cdc9c61b3 Added dummies for Enable and SetDelay.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 16:58:17 +00:00
Stefan Neis
8681f66ced Only use unicode format when unicode support is enabled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 16:56:58 +00:00
Stefan Neis
af98011723 Added Unix implementation of platform specific files for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 16:03:03 +00:00
Václav Slavík
e1e61c81bd fixed utils.bkl to include all utils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 15:52:48 +00:00
Vadim Zeitlin
5ed08e5bb5 fix wxLongLong values printinf for MGL and for wxUSE_LONGLONG_WX case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 15:08:49 +00:00
David Elliott
518e56a71b Removed MainLoop, ExitMainLoop, Pending, and Dispatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 13:15:56 +00:00
David Elliott
8897ca05eb Added src/cocoa/evtloop.mm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 13:12:52 +00:00
David Elliott
f5e1002650 Extremely simple implementation of wxEventLoop using wxGTK as a skeleton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 13:05:42 +00:00
Václav Slavík
9eb1290492 use soft links, not hard links for data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 12:09:36 +00:00
Václav Slavík
57e7d4ac1b fixed incorrect output of wx-config --libs for wxBAse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 12:07:57 +00:00
Vadim Zeitlin
9ffa72272b fixed off by 1 in new GetRange() for wxTE_RICH2 controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 22:45:10 +00:00
Vadim Zeitlin
c8b1e8049e fixed (harmless) mem leak when wxUSE_THREADS == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 21:01:18 +00:00
Stefan Neis
b93aba841c Correctly bracketed initializers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 18:08:25 +00:00
Robin Dunn
bfe3577625 Added a const to be consistent with the generic class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 16:51:36 +00:00
Stefan Neis
dd133a2044 Switches OS/2 back to generic ListCtrl and TreeCtrl as those compile and
link at least (and problems with generic controls needs fixing anyway).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 16:50:41 +00:00
David Elliott
9c6e197f65 include "wx/encinfo.h" for wxNativeEncodingInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 16:15:31 +00:00
Chris Elliott
38a87cfe1a fix for DMC bug reading JPEGs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 15:53:14 +00:00
Vadim Zeitlin
e669d18427 don't lose encoding information when getting/setting the text in the control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 12:24:45 +00:00
Robin Dunn
1a8aa6a1e3 regenerated the images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 04:26:33 +00:00
Robin Dunn
8b9a4190f7 A huge glob of changes in the 2.4 branch merged over to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-02 00:58:06 +00:00
Robin Dunn
e3c0dc265f newevent helpers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 23:30:43 +00:00
Robin Dunn
0a358773fc makedocs script now also crunches through some of the contribs docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 23:29:54 +00:00
Robin Dunn
2f0f3b0fd6 Added listbook demo and also some other demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 23:28:31 +00:00
Stefan Neis
2d28c41cbd Insure that top level windows will be at least visible
when relying on default size.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 21:50:56 +00:00
Stefan Neis
b21ec1a76c Added MarkDirty implementation for MultiLine Edit controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 21:23:04 +00:00
Vadim Zeitlin
430d4341ff mention Spanish translations update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 20:48:44 +00:00
Vadim Zeitlin
3d28993d19 update from JSJ
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 20:45:15 +00:00
Vadim Zeitlin
bdb4888d5a added translation to Afrikaans (Petri Jooste)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 18:51:17 +00:00
Václav Slavík
cea43339ac fixed accelerators in wxGTK if NumLock is active (bug #723379)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 17:05:06 +00:00
Mattia Barbon
653eafdf4f More wxMac compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 16:43:17 +00:00
Václav Slavík
8b44810e29 wxInetFSHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 15:16:20 +00:00
Mattia Barbon
71ada1a5fb More (blind) wxMac configtool compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 11:51:42 +00:00
Václav Slavík
0fba0ec77b fixed file: protocol for filenames with space (patch #815772)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 11:47:30 +00:00
Václav Slavík
9e983cb2b9 wx resource file must be linked into executables on OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-01 10:23:27 +00:00
Vadim Zeitlin
75a21d5e18 mention wxChoice::Delete() change in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 22:28:55 +00:00
Vadim Zeitlin
f6bc4102d7 and now it even compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 22:26:47 +00:00
Vadim Zeitlin
e2380ce157 make Delete() work in presence of client data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 22:24:06 +00:00
Vadim Zeitlin
020172f684 compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 22:14:20 +00:00
Mattia Barbon
5774198c7f Blinf wxMac compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 21:22:56 +00:00
Robin Dunn
7ea515abfb Various changes needed to get up to date with current CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 21:04:25 +00:00
Stefan Neis
3c623cf7d9 Correctly bracketed initializers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 20:22:16 +00:00
Stefan Neis
ee22d7f339 Modal dialogs now correctly use wxEventLoop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 20:13:51 +00:00
Stefan Neis
bd76e17e0f Fixed compilation problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 19:56:23 +00:00
Stefan Neis
b76fa6fe3b Fixed compilation problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 19:13:53 +00:00
Václav Slavík
ebf0700dda properly quote characters when streaming out XML properties
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 19:08:28 +00:00
Robin Dunn
6612393c00 Fixed bad merge...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 19:07:59 +00:00
Robin Dunn
a4f3565ebd More AutoComplete crash fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 19:04:03 +00:00
Václav Slavík
6a8fb6bdea XML code fixes (patch #815196)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 18:36:05 +00:00
Stefan Csomor
9c9ceb4820 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 15:52:50 +00:00
Vadim Zeitlin
aef35d0ef5 use wxEvent::ShouldPropagate() instead of its own propgation control mechanism in wxNavigationKeyEvent (patch 814644)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:49:56 +00:00
Vadim Zeitlin
18da7cf292 Unicode fixes for Watcom (part of patch 813225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:41:46 +00:00
Vadim Zeitlin
2ef76992c8 no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:33:28 +00:00
Vadim Zeitlin
cb0bcdd65c don't draw raised border around disabled bitmaps (patch 814745)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:29:34 +00:00
Vadim Zeitlin
9542f0a109 treat 0xc0c0c0 as transparent colour by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:26:42 +00:00
Václav Slavík
2bcfc494aa upgraded bakefile to empy-3.1.1, it has more readable templates syntax
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 06:30:24 +00:00
Vadim Zeitlin
33c9645172 unused params warnings fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 00:29:04 +00:00
Robin Dunn
2d588cb2b0 Should not delete colours that come from the wxColourDatabase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-29 17:42:18 +00:00
Vadim Zeitlin
8d00896532 support creating larger minidumps; support WX_CRASH_FLAGS env var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-29 17:14:52 +00:00
Mattia Barbon
c58cff9a19 (Blind) compilation fix for Sun compiler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-29 15:18:35 +00:00
Vadim Zeitlin
bd947cc9f0 fixes in cleanup of DDE servers: don't delete them ourseleves (this is inconsistent with socket IPC classes); do check that they're all destroyed before DDE is shut down
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-29 12:05:49 +00:00
Václav Slavík
5554b4bda9 reversed order of configurations to make the IDE happy about the default one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 18:38:11 +00:00
Václav Slavík
2e9fdc04f2 compile db sample conditionally only if odbc support was built
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 18:23:23 +00:00
Vadim Zeitlin
ac95e67140 reverted strange and IMO unnecessary OFN_OVERWRITEPROMPT emulation (bug 812346)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 18:12:26 +00:00
Vadim Zeitlin
2b2a5a8cbe SetValue() takes just bool, not const bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 18:01:42 +00:00
Vadim Zeitlin
0da52ad172 SetValue() takes just bool, not const bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 17:51:11 +00:00
Václav Slavík
bed0b9a688 added displayx11.{cpp,h}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 16:05:23 +00:00
Mattia Barbon
f4998a1cc6 MinGW compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 13:57:52 +00:00
Mattia Barbon
1bf538e210 (Blind) wxMotif compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 13:53:07 +00:00
Vadim Zeitlin
4f5c4ebf1a mention that Write(string) works with NUL-terminated strings only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 11:10:46 +00:00
Vadim Zeitlin
14f286429e mention wxListBook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 00:29:57 +00:00
Vadim Zeitlin
8941fa8806 added 3-state checkboxes (patch 813790)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-28 00:23:08 +00:00
Vadim Zeitlin
b71531ad92 regenerated after adding gzstream.* and vidmode.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:48:14 +00:00
Vadim Zeitlin
4547faae1d no changes, just resolved a conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:40:49 +00:00
Vadim Zeitlin
1bf0f0af62 show how to use different bitmaps for enabled/disabled menu item state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:33:06 +00:00
Vadim Zeitlin
a63e17c122 added wxMirrorDC test; some warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:30:41 +00:00
Vadim Zeitlin
a48b9bfb14 added handlers for radio btn events for testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:28:58 +00:00
Vadim Zeitlin
a0b0865599 warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:28:28 +00:00
Vadim Zeitlin
5bc1deebaa added a test for wxTextFile in Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:27:52 +00:00
Vadim Zeitlin
cc70081166 removed Initialized()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:20:28 +00:00
Vadim Zeitlin
32e2c7613d Unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:14:44 +00:00
Mattia Barbon
5a98fd8de0 Linking fixes for wxGTK + wxUniversal: include minifram.cpp in
lowlevel files (as in wxMSW and wxX11).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 14:10:44 +00:00
Vadim Zeitlin
e8b7a0d641 removed duplicate UTF16/32 values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 14:06:18 +00:00
Vadim Zeitlin
3cb98121f2 fixed bug in wxDisplay::GetFromPoint() when Xinerama is not used (patch 813543)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:58:10 +00:00
Vadim Zeitlin
93255dade6 extra word removed (patch 813536)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:49:01 +00:00
Vadim Zeitlin
dd435a79ed removed wxApp::Initialized() (replaced with a dummy version in wxApp itself); wxApp in wxGTK now uses wxEvtLoop too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:47:46 +00:00
Mattia Barbon
080a7b206c Updated changes.txt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:33:45 +00:00
Vadim Zeitlin
1bba1946d5 suppress compiler warning about uninit var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:28:28 +00:00
Vadim Zeitlin
051a889da9 define wxFONTENCODING_UNICODE as UTF16/32 depending on the platform
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:24:57 +00:00
Vadim Zeitlin
4048a3c86f added vidmode.h; stack.h is a wxBase header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:18:27 +00:00
Vadim Zeitlin
d8cf2b8d7d made UTF-16/32 equivalent to the corresponding LE/BE version (patch 812358)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 13:13:22 +00:00
Vadim Zeitlin
fedec98126 merged wxDisplayModeInfo and wxVideoMode in a single class, extracted it in a separate wx/vidmode.h header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 12:55:46 +00:00
Vadim Zeitlin
3dd514f167 compilation fix for Mac (patch 813378)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 12:36:30 +00:00
Vadim Zeitlin
1d5b3bf041 fix for handling (Shift-)Ctrl-Tab when the notebook itself has focus (patch 813507)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 12:34:05 +00:00
Vadim Zeitlin
724a907cbb minor fix for wxSlider sizing (patch 809202)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 12:26:19 +00:00
Vadim Zeitlin
331c9f56a4 fixes to radio button handling (patch 803360)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 11:43:01 +00:00
Vadim Zeitlin
8b1ed8d979 update height of the header window whenever it changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 23:47:28 +00:00
Vadim Zeitlin
9c0eae85b9 make it possible to give focus to the notebook itself (patch 811013)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 21:44:31 +00:00
Vadim Zeitlin
b8bdaa7c2b make it possible to give focus to the notebook itself (patch 811013)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 21:36:33 +00:00
Vadim Zeitlin
7015ef3aae regenerated after adding wxUSE_GZSTREAM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 21:13:30 +00:00
Vadim Zeitlin
d7a7546b8e fixed code for swapping rect corners if out of order (bug 800180)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 20:50:27 +00:00
Vadim Zeitlin
6f96ac03f0 added wxGzipIOStreams (patch 792932)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 20:24:36 +00:00
Vadim Zeitlin
bcda793a4e added wxTextInputStream::ReadChar() (part of patch 792932)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 20:15:38 +00:00
Vadim Zeitlin
0915d0b2e2 wxZlibStreams fixes; allow them to be used as deflate [de]compressor in gz/zip files (patch 792562)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 20:07:22 +00:00
Vadim Zeitlin
6bb7cee4e9 fixes to radio button handling (patch 803360)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 19:43:47 +00:00
Vadim Zeitlin
3bf4189d96 added tests for toggling radio buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 19:37:32 +00:00
Vadim Zeitlin
96dc423640 show wxTB_HORZ_LAYOUT in action
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 18:19:50 +00:00
Vadim Zeitlin
03a991bc7a always return length of the string, *not* size of the buffer from wxMBConv_win32::MB<->WC(), as documented (fixes bug reported in patch 789039)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 18:15:09 +00:00
Vadim Zeitlin
2736a5def9 fix SetFocus() in wxDialog-derived class ctor (which used to be ignored); this replaces patch 769552
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 17:35:54 +00:00
Vadim Zeitlin
e19971c370 applied part of the patch 811993
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 17:11:49 +00:00
Vadim Zeitlin
bda3d86af9 don't do anything non trivial (like creating wxFontMapper) in ctors of global objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 16:55:53 +00:00
Julian Smart
03c0e93785 Updated date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 15:06:18 +00:00
Julian Smart
5b956b52d5 Small distribution script changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 15:04:55 +00:00
Vadim Zeitlin
2a8f35c325 fixed (recently reintroduced) activation bug when the modal dialog was dismissed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 12:38:49 +00:00
Julian Smart
afa039f920 Clean up event hash tables in a timely fashion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-26 10:50:58 +00:00
Vadim Zeitlin
fcb35beb94 compilation fixes after making wxFontRefData private (added wxFont::GetMacXXX())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-25 23:10:35 +00:00
Vadim Zeitlin
978f48c648 initialize hidden window class name with NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-25 22:06:00 +00:00
Vadim Zeitlin
ef92f44097 wxPATH_NORM_ALL shouldn't include wxPATH_NORM_CASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-25 22:04:53 +00:00
Robin Dunn
9e70eb3b1d Change how/when the app object is created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 21:18:13 +00:00
Robin Dunn
4c5304540d float --> int fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:24:51 +00:00
Robin Dunn
04443bbfb0 HitTest patch from Alberto
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:23:43 +00:00
Robin Dunn
1a8372ba0f reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:22:51 +00:00
Robin Dunn
1a10a058d5 Changes needed to get upto date with the latest wx CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:09:53 +00:00
Robin Dunn
e04fe03d0f Since wxGTK's wxGauge doesn't derive from wxGaugeBase it needs to have
an IsVertical method added too


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:08:25 +00:00
Robin Dunn
9d41f689dc #ifdef update for the old SWIG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 20:06:19 +00:00
Robin Dunn
3684ade82e Oops, I left an extra { in there.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 19:59:03 +00:00
Robin Dunn
840d782c79 Corrected some tex errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 19:43:00 +00:00
Mattia Barbon
ca2bd5e34b Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 17:46:51 +00:00
Vadim Zeitlin
0bff3f6905 got rid of ugly WinCE #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 16:34:36 +00:00
Vadim Zeitlin
3398cf2cf6 added stabs for missing wxNativeFontInfo methods when using Pango
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 16:07:07 +00:00
Vadim Zeitlin
9e9eea73bc gcc warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 15:59:22 +00:00
Vadim Zeitlin
89654c9a49 GetFilenames() always returned a single file only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 15:06:53 +00:00
Vadim Zeitlin
92679f9f29 fixed spurious debug message when right clicking outside of any items area
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 15:03:57 +00:00
Vadim Zeitlin
cf36ec2583 unused param warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 15:01:08 +00:00
Vadim Zeitlin
97f278b453 finally reverted patch 782947 completely, it is broken; added just a check that id returned by SetTimer() is not a dup instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 14:48:33 +00:00
Vadim Zeitlin
5b6c8794de attempt to fix timers when creating them with a valid HWND
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 13:46:34 +00:00
Vadim Zeitlin
3ad38858fd compilation fix for BCC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 12:45:11 +00:00
Chris Elliott
f4d3253b59 fix digitalmars bug (ambiguous symbol)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 08:29:21 +00:00
Julian Smart
b853ebf6f5 Tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 07:26:55 +00:00
Vadim Zeitlin
74b0216f3a compilation fix after GetNativeFontInfo() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 02:08:39 +00:00
Vadim Zeitlin
caa36aab84 undid accidental change to assert in Start() during last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 01:54:39 +00:00
Vadim Zeitlin
480e58979a mention GetNativeFontInfo() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 01:26:34 +00:00
Vadim Zeitlin
3bf5a59b5e pointer returned by GetNativeFontInfo() is now const and must not be deleted (replaces patch 810192)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 01:23:37 +00:00
Vadim Zeitlin
cb0afb2662 replaced wxNO_FULL_REPAINT_ON_RESIZE with wxFULL_REPAINT_ON_RESIZE in XTI declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 00:41:06 +00:00
Vadim Zeitlin
e441e1f4e8 made wxNO_FULL_REPAINT_ON_RESIZE default, added wxFULL_REPAINT_ON_RESIZE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 00:26:40 +00:00
Robin Dunn
80097f32fe Applied Patch #775357
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 00:21:17 +00:00
Vadim Zeitlin
eccd199223 refactored code to create hidden window in one place only; use it from wxTimer; unregister class used by wxExecute (modified patch 782947)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 23:57:32 +00:00
Vadim Zeitlin
007bea23c3 TransferFrom/ToWindow() were reverted, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 23:54:33 +00:00
Robin Dunn
dc76287dcd Allow derived classes to prevent default focus handling (by not
calling Skip)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 23:48:17 +00:00
Robin Dunn
b0d0494ff5 Fixes in focus handling related to the AutoComplete window.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 23:42:41 +00:00
Vadim Zeitlin
dcc8fac0c3 fix for Unix compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 22:22:27 +00:00
Julian Smart
653567bb4c char -> wxChar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 22:13:36 +00:00
Mattia Barbon
2bbd97f433 Add a couple of wxPerl notes.
Mark keyed wxList methods as deprecated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 19:29:23 +00:00
Mattia Barbon
05e770c40e Use glcanvas.cpp from wxX11 for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 19:25:45 +00:00
Vadim Zeitlin
1a3bb45ee7 fixed MarkDirty()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 17:16:43 +00:00
Vadim Zeitlin
b5153fd845 fixed compilation problems with platforms where wchar_t != ushort
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 17:12:43 +00:00
Julian Smart
0308fd61a2 Fixed bug [ 756485 ] wxDateTime::ParseTime fails with assertion when it shouldn't
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 17:01:15 +00:00
Julian Smart
987263fe19 Fixed bug [ 754596 ] wxUSE_CONSTRAINTS 0 breaks AutoLayout() with sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 17:00:17 +00:00
Chris Elliott
641a7c45b5 fix digitalmars 64 bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 09:52:37 +00:00
Chris Elliott
e84c7178fe fix watcom 64 bug (openwatcom1.1) (second try)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 09:36:25 +00:00
Chris Elliott
3ca91ffb3d fix watcom 64 bug (openwatcom1.1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 09:33:21 +00:00
Vadim Zeitlin
3a9fa0d6b5 added wxTextCtrl::MarkDirty()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 00:09:18 +00:00
Vadim Zeitlin
ff1b5f81af fixed bug in DeleteEntry()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 20:36:58 +00:00
Vadim Zeitlin
845f426885 updated wxMBConv docs slightly; added brief docs for UTF16/32 conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 20:34:03 +00:00
Vadim Zeitlin
bde4baaced more wxMBConv classes cleanup, define wxConvLibc to use Win32 API under Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 20:29:15 +00:00
Vadim Zeitlin
57c5293e49 made Convert() methods const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 20:15:00 +00:00
Vadim Zeitlin
9769627970 assume sizeof(wchar_t) == 2 by default, not 4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 19:25:32 +00:00
Vadim Zeitlin
e95354ec54 added UTF-16/32-[LB]E conversions; got rid of wxCharacterSet and simplified and fixed some bugs in remaining code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 17:11:56 +00:00
Vadim Zeitlin
c0dd4372a3 wxLL is now in wx/defs.h together with (new) wxULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 17:10:30 +00:00
Vadim Zeitlin
116b407e4f added ctor taking wxFontEncoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 17:09:08 +00:00
Vadim Zeitlin
3c59549689 documented wxCONCAT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 15:32:47 +00:00
Vadim Zeitlin
84ed77ef28 added (and documented) wxULL(); fixes for wxINT64_SWAP macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 15:30:25 +00:00
Vadim Zeitlin
8fb3747278 reorganized/improved fixed size int types definitions; in particular use __int64 for wxInt64 if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 13:47:55 +00:00
Vadim Zeitlin
ef620df011 added Win64 detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:43:36 +00:00
Vadim Zeitlin
014c5a64b5 moved wxGA_XXX styles to gauge.h from defs.h; set wxGA_PROGRESSBAR as 0 (it's not used anywhere anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:35:21 +00:00
Vadim Zeitlin
da0f19f8a8 cleanup: derive wxGauge from wxGaugeBase; removed redundant code from Create() (use base class methods instead); implemented MSWGetStyle() and GetBestSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:31:58 +00:00
Vadim Zeitlin
0a4e332382 updated; added IsVertical()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:29:36 +00:00
Vadim Zeitlin
9446dc2642 added IsVertical(); initialize members in ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:28:25 +00:00
Vadim Zeitlin
69b80d287d compilation fix (part of patch 810484)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:23:39 +00:00
Vadim Zeitlin
375fc5a970 fix for crash when using user-dashed lines (patch 801663)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:20:39 +00:00
Jouk Jansen
a63b9404f6 Committing in .
Added src/gtk/evtloop.cpp for compilation on OpenVMS.

 Modified Files:
 	wxWindows/src/gtk/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:16:28 +00:00
Vadim Zeitlin
311a173bcc removed some TABs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:14:44 +00:00
Julian Smart
6df2a555c6 Must use --disable-fs_inet to avoid chkcnf error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 12:13:55 +00:00
Vadim Zeitlin
9a78988fed support full 32bit range in wxGauge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 11:36:48 +00:00
Chris Elliott
624d506b58 fix for gtk swapped colors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 09:44:57 +00:00
Stefan Neis
7332d96bd5 Fixed wxGUIAppTraits declaration on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 06:04:49 +00:00
Vadim Zeitlin
a1d8baa9f2 fixed broken link
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:47:27 +00:00
Vadim Zeitlin
104032545e added wxOwnerDrawn::SetOwnerDrawn() and SetDisabledBitmap(); corrected calculation of menu width and drawing of accels for disabled items (parts of patch 758598)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:43:36 +00:00
Stefan Neis
a637417cf7 Added GUI part of AppTraits for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:39:22 +00:00
Vadim Zeitlin
c91830cb4b added conversions to/from UTF 16/32 LE/BE (patch 809685)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:12:10 +00:00
Stefan Neis
9fc852b7ff Added AppTraits for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:02:44 +00:00
Stefan Neis
8329e6c730 Added AppTraits for starting/ending a thread.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:01:32 +00:00
Vadim Zeitlin
7e541da8b0 set event object for wxContextMenuEvent (patch 797697)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 23:59:02 +00:00
Vadim Zeitlin
3ef22a5b02 trying to fix race conditions. double deletions and memory leaks on thread termination (closes bug 775774 and replaces patch 781918)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 23:57:09 +00:00
Stefan Neis
ff3985971d Identify OS/2 by defining __OS2__.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 23:56:02 +00:00
Vadim Zeitlin
4e5bbd4022 terminate child threads in frame dtor, not in OnQuit() (otherwise they're left running if we just close the window)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 23:54:47 +00:00
Stefan Neis
598dc9b777 Switched over to using wxEventLoop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 21:54:03 +00:00
Stefan Neis
9345ca55cb Added declaration for GetViewRect to fix compilo.
FIXME: Implementation is still missing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 21:28:40 +00:00
Julian Smart
b2cef83022 Added wxMGL switch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 21:28:11 +00:00
Vadim Zeitlin
963ac8fbf5 fix problems with terminating while threads are running and more (patch 781922)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 20:36:07 +00:00
Vadim Zeitlin
a67c56641d added IsVisible() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 19:40:35 +00:00
Vadim Zeitlin
caea927d3d IsVisible() shouldn't return true if item is out of screen (bug 640607)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 19:37:35 +00:00
Stefan Neis
d7a8eacae9 Added evtloop.cpp for OS/2 to get rid of linker errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 18:49:38 +00:00
Stefan Neis
bd6685b307 Added #include "wx/encinfo.h" as needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 18:34:43 +00:00
Vadim Zeitlin
050ffabbc3 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 17:22:23 +00:00
Vadim Zeitlin
b12ce1d388 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 16:39:51 +00:00
Vadim Zeitlin
4a1c207cf1 don't return & in strings returned by GetLabelTop() (closes 687905)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 15:22:15 +00:00
Vadim Zeitlin
f607434a0f check the radio buttons when they get focus (closes 777500)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 15:09:13 +00:00
Vadim Zeitlin
54cf600d4e Unicode compilation fix (patch 81006)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 11:02:39 +00:00
Julian Smart
f632aa1e05 Don't assert when Clear() is called, better to ignore it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 00:58:27 +00:00
Vadim Zeitlin
2bbc1b2855 generate standard mini dumps instead of writing our own text file equivalent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 00:15:08 +00:00
Vadim Zeitlin
0b98a2524e memory leak fixes in file dialogs (patch 783812)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 23:59:55 +00:00
Vadim Zeitlin
cc232c9342 emphasize that result of wxGetWorkingDirectory() must be delete[]d
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 23:58:34 +00:00
Vadim Zeitlin
2e622163d0 wxHTTP::GetResponse() added (patch 794394)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 23:55:32 +00:00
Vadim Zeitlin
9473e9a437 corrected TAB order of wizard buttons (patch 800935)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 23:45:20 +00:00
Stefan Neis
d21c1b5672 Updated OS/2 specific part of the installation instructions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 21:26:18 +00:00
Julian Smart
846051ec80 Should be able to use the DC in OnPrepare without generating
a file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 20:36:31 +00:00
Vadim Zeitlin
6576f87995 incremented WX_CURRENT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 19:41:07 +00:00
Stefan Neis
1fe5e0105f Adapted MAKE_SHELL/MAKESHELL to current make versions.
Removed explanations about problems that vanished thanks to new build system.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 19:02:17 +00:00
Vadim Zeitlin
a374426f34 create image list of the right size to avoid asserts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 18:58:39 +00:00
Vadim Zeitlin
0ae0bb792b fix after patch 802882
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 18:34:57 +00:00
Vadim Zeitlin
ace3ed2ef0 exchanged the base classes order, wxObject must be always first
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:34:01 +00:00
Vadim Zeitlin
6f6f938f3a derive wxComboBox from wxItemContainer (via wxComboBoxBase) in wxGTK (patch 802882)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:31:06 +00:00
Vadim Zeitlin
a6fc611aa1 removed mark #pragmas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:24:38 +00:00
Vadim Zeitlin
df5a063f61 destroy the frame if the exception occurs in a dialog shown from it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:23:51 +00:00
Vadim Zeitlin
7a9dfa3c40 fixed cleanup order to behave correctly in presence of exceptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:21:35 +00:00
Vadim Zeitlin
e490e26798 fixed typos which resulted in 2 broken links
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:20:43 +00:00
Vadim Zeitlin
fe277be0f1 call OnExit() even if an exception has been thrown from OnRun()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:18:19 +00:00
Vadim Zeitlin
7e33e48e00 mention exceptions changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 16:12:02 +00:00
Vadim Zeitlin
8e91c6f389 added minimal support for xlc under Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 15:41:41 +00:00
Vadim Zeitlin
de5eec8ebb compilation fix for xlc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 15:38:43 +00:00
Vadim Zeitlin
af34705c34 made globals static to avoid linking problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 15:37:07 +00:00
Vadim Zeitlin
462988d5f9 don't use wx/scopeguard.h for OpenWatcom compatibility (grr...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 15:12:39 +00:00
Mattia Barbon
e4ffab299a Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 13:34:49 +00:00
Vadim Zeitlin
11db7d81d1 Unicode compilation fix (bug 809707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-20 11:35:06 +00:00
Vadim Zeitlin
cb07c54412 (blind) compilation fix after recent KeywordSearch changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 23:53:56 +00:00
Vadim Zeitlin
c45708e75d fixed bug in wxCSConv(encoding) ctor (which I just added)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:35:59 +00:00
Vadim Zeitlin
6a98321125 use wxCSConv instead of Win32 API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:34:50 +00:00
Robin Dunn
443c834d8d Check wxSIZE_ALLOW_MINUS_ONE for x and y too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:32:24 +00:00
Vadim Zeitlin
7411f983f1 wxTextCtrl::GetValue() lost (replaced with question marks) all characters not in the current encoding -- but now it shouldn't
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:21:48 +00:00
Vadim Zeitlin
8b04d4c451 added wxCSConv ctor taking wxFontEncoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:18:06 +00:00
Vadim Zeitlin
9806a823b0 attemps to make wxStreamToTextRedirector work with more (broken) compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:17:38 +00:00
Vadim Zeitlin
0bc9347069 include wx/encinfo.h, not wx/fontenc.h, now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:15:55 +00:00
Mattia Barbon
ccabcd49c0 Try linking wxMotif without -lSM and -lICE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:14:51 +00:00
Vadim Zeitlin
e770e665fa added wx/encinfo.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:09:34 +00:00
Václav Slavík
22fd4d7d5e backported wxZipFSHandler fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:06:04 +00:00
Vadim Zeitlin
48f9e8107a extracted wxNativeEncodingInfo in a separate file to be able to include wx/fontenc.h from wx/strcov.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 22:04:15 +00:00
Václav Slavík
d73d01b8ed backported intl.cpp fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 21:50:04 +00:00
Mattia Barbon
2fcce89663 Compilation fix for wxUSE_DRAG_AND_DROP==0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 21:44:42 +00:00
Robin Dunn
02319c2458 Prevent possible divide by zero problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 20:27:11 +00:00
Robin Dunn
1e545382ca Patch #809286 and a couple other minor changes to the stc sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 18:40:13 +00:00
Robin Dunn
854e7dc332 SWIGged updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 16:46:57 +00:00
Robin Dunn
36a73f1d03 Changes for removing DefaultEncodingIsPC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 16:46:03 +00:00
Robin Dunn
4326f7b7b2 Updated version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 16:44:43 +00:00
Robin Dunn
856036c670 Regenerated some contrib makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 16:33:37 +00:00
Julian Smart
6a205442c4 Applied patch [ 809066 ] Cleanup for text2rtf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 16:09:29 +00:00
Mattia Barbon
07ee782bb8 Do not use wx/wx.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 15:44:28 +00:00
Vadim Zeitlin
1dab049c9e fix for generating set/kill focus events for wxRadioBox (also fixes TABbing in a panel containing a radio box)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 12:06:18 +00:00
Vadim Zeitlin
df0787b662 use wxTAB_TRAVERSAL style for panels and frame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 12:04:52 +00:00
Vadim Zeitlin
5a41643a8d linking fix (removed unused virtual methods declarations)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 11:55:32 +00:00
Julian Smart
c27be5db0b Added SQLTCHAR for non-Windows platforms, and added missing
wxFputs to wxchar.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 10:59:14 +00:00
Robin Dunn
f6aa2b2cfb Only process dynamic events if the eventTypes match
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 01:32:44 +00:00
Vadim Zeitlin
759b3c7e2f don't ever define HAVE_THREAD_CLEANUP_FUNCTIONS, the code in threadpsx.cpp doesn't work in this case anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 00:46:44 +00:00
Vadim Zeitlin
ef4f69ec32 cleaned up VMS #ifdef mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 00:29:31 +00:00
Vadim Zeitlin
63fa42b3be attempt to fix race condition between Delete() and Wait()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 00:19:50 +00:00
Vadim Zeitlin
3e5175b737 check whether input stream is readable in OpenFile() (patch 808941)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 00:01:08 +00:00
Robin Dunn
7b443969ac Added some missing constants and fixed GetPoints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 23:48:29 +00:00
Vadim Zeitlin
71aba8333c fix text scrolling in GTK2 (patch 703988)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 23:48:22 +00:00
Vadim Zeitlin
cc59cd23e6 removed bogus #pragma implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 23:45:14 +00:00
Vadim Zeitlin
560e2916a9 corrected parsing of dates like 01.02.03 (where year can be confused with the day) in ParseDate()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:51:50 +00:00
Václav Slavík
9833a21ac4 configurable use of exceptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:46:53 +00:00
Václav Slavík
671a85ea56 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:46:21 +00:00
Václav Slavík
40fe5843d2 added <cxx-rtti> and <cxx-exceptions>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:45:47 +00:00
Václav Slavík
afcc5de1b6 fixed single word selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:44:16 +00:00
Robin Dunn
4a65f2c80d Added DoDragOver and DoDropText from Angelo Mandato, and ensured that
my unicode LoadFile/SaveFile changes were in the .in file this time.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:28:25 +00:00
Vadim Zeitlin
86c8acb774 don't redefine wxUSE_UNICODE if already defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 22:13:45 +00:00
Robin Dunn
94d04b7ed3 Always build prntdlgg for wxMSW since it will be needed if
wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW is turned on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 20:53:18 +00:00
Robin Dunn
b2dfe63f8e SWIGged updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 20:49:47 +00:00
Robin Dunn
62e8fcee74 some more test code for the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 20:48:50 +00:00
Robin Dunn
b8be6ceacf Fix for internal compiler error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 20:45:39 +00:00
Robin Dunn
dd9b0a5495 Added missing }
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 20:40:41 +00:00
Robin Dunn
0e974385f6 Patch #808669 more warngins and unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 17:35:31 +00:00
Vadim Zeitlin
532c773634 missing headers for !USE_PCH compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 15:52:34 +00:00
Julian Smart
a47391f3f9 Reverted fragment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 15:06:53 +00:00
Vadim Zeitlin
8bd2a80432 fix the bug with not skipping events any more after recent changes (stupid, stupid typo)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 14:29:56 +00:00
Vadim Zeitlin
c72b8276c8 Julian already applied this patch...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 14:16:37 +00:00
Julian Smart
8a39593ebe Applied patch [ 808050 ] fixes for WXUNIVERSAL and UNICODE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 14:03:09 +00:00
Julian Smart
859e5b177d Applied patch [ 807366 ] fixes for wxrcedit contrib util
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:47:05 +00:00
Julian Smart
66b9ec3dab Applied patch [ 807164 ] fixes for core library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:42:22 +00:00
Julian Smart
7d418908fe Applied patch [ 804996 ] compatibility of access sample with various settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:36:10 +00:00
Julian Smart
babd36de3a Applied patch [ 807060 ] warning free demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:33:34 +00:00
Julian Smart
f0b1ccde63 WinCE doesn't have GetMessageTime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:14:34 +00:00
Julian Smart
f8d5683072 Applied patch [ 808328 ] restore border styles for wxFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 13:03:27 +00:00
Stefan Csomor
01c185668f support for true two button mouse under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 12:37:53 +00:00
Stefan Csomor
8f793b407c turning on old quit apple event handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 12:19:19 +00:00
Julian Smart
f7d4537c2b Added wxUSE_EXCEPTIONS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 12:03:04 +00:00
Stefan Csomor
f81c1056ab moved drawing to isvisible branch only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 11:50:18 +00:00
Vadim Zeitlin
404a4d9363 tool windows shouldn't appear on the taskbar (patch 808350)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 11:32:09 +00:00
Vadim Zeitlin
933b675ed4 corrected the example of wxMessageBox() usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 11:10:51 +00:00
Václav Slavík
8b0f8432d7 wxMGL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 10:55:44 +00:00
Václav Slavík
752464f9f3 wxMGL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 10:01:59 +00:00
Václav Slavík
e46d2a18df wxMGL fixes: detect mgl50r11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 09:27:02 +00:00
Robin Dunn
88a8b04e9c Updated to Scintilla 1.54
Applied most of patch #806092
Added new wxSTC sample from Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 05:05:52 +00:00
Vadim Zeitlin
a47ae718e2 warnings fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-18 00:28:05 +00:00
Vadim Zeitlin
556b8c1aab new sample showing how to handle exceptions in wxWindows code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:37:54 +00:00
Vadim Zeitlin
d0e278d98e removed wxMsgArray definition (now in evtloop.cpp) and OnIdle() sempaphore (shouldn't be needed any longer)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:37:07 +00:00
Vadim Zeitlin
fb3e83b60a call wxApp::OnUnhandledException()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:36:07 +00:00
Vadim Zeitlin
1c62463166 moved all event handlers callign code in ProcessEventIfMatches() instead of triplicating it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:35:36 +00:00
Vadim Zeitlin
8c7f5f031b use wxModalEvtLoop, made more code exception safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:34:07 +00:00
Vadim Zeitlin
4300caa7a6 added OnExit(); made event loop exception safe; added wxModalEvtLoop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:32:32 +00:00
Vadim Zeitlin
efbfda9d66 use standard tied pointer now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:31:58 +00:00
Vadim Zeitlin
883117d126 added HandleEvent() to allow handle exceptions in event handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:30:53 +00:00
Vadim Zeitlin
6f054ac5e8 documented how to handle C++ exceptions in wxWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:30:25 +00:00
Vadim Zeitlin
4c39aa3a65 documented how to handle C++ exceptions in wxWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 23:25:22 +00:00
Stefan Csomor
4891a3d58e no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 21:36:15 +00:00
Mattia Barbon
48748ed497 Regenerated with newer bakefile, fixing DESTDIR bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 20:46:49 +00:00
Robin Dunn
dfaff5b0cc Added character coding comment for Python 2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 20:22:15 +00:00
Robin Dunn
1ad053872a Unicode fix from Will
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 20:21:28 +00:00
Vadim Zeitlin
38f1526768 added tied scoped pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 17:27:36 +00:00
Vadim Zeitlin
f0658b1e1e corrected wxCATCH_ALL usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 17:09:23 +00:00
Vadim Zeitlin
5800b5bed6 use wxON_BLOCK_EXIT instead of just ON_BLOCK_EXIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 16:59:40 +00:00
Vadim Zeitlin
2524f1ce36 added some trivial macros for exception handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 12:06:36 +00:00
Vadim Zeitlin
252e57cee2 added wxUSE_STL and wxUSE_XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 10:40:18 +00:00
Vadim Zeitlin
c37dc21c19 added wxUSE_EXCEPTIONS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 10:39:09 +00:00
Julian Smart
3e5e2ea5d9 Added missing makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-17 08:04:38 +00:00
Vadim Zeitlin
dd7ebf8b75 fixed fatal typo in wxYieldForCommandsOnly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 22:48:46 +00:00
Vadim Zeitlin
afbdbdb491 mention that Add/RemoveChild() are internal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 22:21:10 +00:00
Robert Roebling
9abbd4a017 Left in some debug code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 21:58:02 +00:00
Vadim Zeitlin
d1fc6f0658 don't hang forever in Dispatch() if there is no event loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 21:29:32 +00:00
Mattia Barbon
5b3b52ef31 wxX11 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 21:16:03 +00:00
Mattia Barbon
e6b9830a06 wxX11 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 21:02:22 +00:00
Václav Slavík
657477c45e very minor correction wrt bakefile --help
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 20:23:07 +00:00
Václav Slavík
86a9a155a9 added makefile.unx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 19:18:18 +00:00
Vadim Zeitlin
7ae238e5be updated makefiles generation section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 17:37:40 +00:00
Julian Smart
40ff41006c Added missing makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 13:36:00 +00:00
Vadim Zeitlin
f303564dbd reverted the delete/Destroy() change in DestroyChildren()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 12:35:13 +00:00
Vadim Zeitlin
6757b5e31c fixed modal dialogs after event loop change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 12:30:34 +00:00
Vadim Zeitlin
fb761cd53c (blind) fix for wxMac compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 10:52:57 +00:00
Chris Elliott
273d976663 library file for d mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-16 07:26:13 +00:00
Václav Slavík
004779cd73 added DESTDIR support to make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 21:00:27 +00:00
Stefan Csomor
105b0fcae7 fix for preserving the clip rgn (control redraws missing after switch to faster redraw, in the end we probably best reset the clip region after a wxDC has been destroyed for a grafport
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 20:39:06 +00:00
Vadim Zeitlin
5d6cbce26b use wxEventLoop in wxApp under wxMSW; factored out common code from wxX11/wxMotif/wxMGL to wxAppBase; changed wxApp::Dispatch() return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 20:03:13 +00:00
Vadim Zeitlin
f2108ede7c no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:55:17 +00:00
Vadim Zeitlin
ac8d0c118b added wxVALIDATOR_PARAM and use it to avoid warnings about unused validators when wxUSE_VALIDATORS==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:54:51 +00:00
Vadim Zeitlin
bcd3832a82 use wxEventLoop in wxApp under wxMSW; factored out common code from wxX11/wxMotif/wxMGL to wxAppBase; changed wxApp::Dispatch() return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:53:18 +00:00
Vadim Zeitlin
1bf77ee556 use wxEventLoop in wxApp under wxMSW; factored out common code from wxX11/wxMotif/wxMGL to wxAppBase; changed wxApp::Dispatch() return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:48:16 +00:00
Vadim Zeitlin
4c9d78a4f9 fixed return value of wxMDIChildFrame::HandleGetMinMaxInfo()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:29:54 +00:00
Robin Dunn
7475e81462 Ensure that the native font is initialized so the face name and such
are valid


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:27:47 +00:00
Václav Slavík
917d18aadb added makefile.unx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:23:45 +00:00
Vadim Zeitlin
f8ba082ece added check for wxUSE_VALIDATORS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 19:14:28 +00:00
Vadim Zeitlin
d83eeece0e added and documented wxDEFINE_SCOPED_PTR_TYPE; improved docs a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 16:10:06 +00:00
Julian Smart
ec08d395bd Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 15:36:27 +00:00
David Elliott
70fb935a6a Cleaned up some comments, reorganized some code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 15:34:11 +00:00
David Elliott
cdd0a08f32 Clean up comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 15:22:45 +00:00
Vadim Zeitlin
84dfd58f69 fixed iODBC detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 14:10:31 +00:00
Vadim Zeitlin
4199367e9c added wxUSE_EXCEPTIONS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 13:00:34 +00:00
Chris Elliott
216db41f96 sf patch #806451
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 12:28:11 +00:00
Vadim Zeitlin
cafcf62a83 remove us from the parents children list in Destroy()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 11:46:51 +00:00
Vadim Zeitlin
8e35ab96f6 call RemoveChild() in ~wxWindowBase instead of doing it in each ~wxWindow for each port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 11:45:08 +00:00
Chris Elliott
8bdd5efa86 fix incorrect parameter error fo r DrawArc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 11:42:54 +00:00
Vadim Zeitlin
6ed506b9d7 IsDialogMessage fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 11:39:38 +00:00
Vadim Zeitlin
75299490cd wxNavigationKeyEvent doesn't derive from wxCommandEvent (but from wxEvent)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 11:00:51 +00:00
Julian Smart
419430a0c0 WinCE bitmap patch from Johannes Schindelin <Johannes.Schindelin@gmx.de>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 08:55:19 +00:00
Vadim Zeitlin
de07d2004f implemented wxDateTime::ParseDateTime() (patch 779794)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 23:13:18 +00:00
Vadim Zeitlin
ab96d680eb adjust m_current when inserting items in the control (patch 799937)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 22:59:02 +00:00
Vadim Zeitlin
86351e4a9d fix for calculating the header window height (patch 805791)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 22:52:47 +00:00
Vadim Zeitlin
94dd23aebc align the items correctly with wxLC_ALIGN_TOP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 21:10:22 +00:00
Vadim Zeitlin
13602ebd04 added support for wxLC_ALIGN_LEFT/TOP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 20:40:26 +00:00
Vadim Zeitlin
eb6c4508c9 account for the scrollbars in GetViewRect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 19:52:46 +00:00
Julian Smart
93f467a3b4 Changed version to 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 19:39:34 +00:00
Vadim Zeitlin
ef0120c1bb disabled (conditionally) separating static line; improved borders
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 19:37:35 +00:00
Vadim Zeitlin
a328684392 removed the fudge from GetViewRect(), it isn't needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 19:36:33 +00:00
Vadim Zeitlin
ae03fa2c96 GePageRect() should use the full list size while OnSize() should use the client size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 19:03:17 +00:00
Stefan Csomor
939fba6c17 removal of pc-mac charset conversion for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 18:40:43 +00:00
Vadim Zeitlin
a2b436fb40 use child->Destroy() instead of delete child in DestroyChildren()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 16:18:12 +00:00
Vadim Zeitlin
f58fc1407b compilation fix after last check in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 16:12:05 +00:00
Vadim Zeitlin
5db8d758b8 fixed GetItemSpacing() inconsistency by deprecating the old function and adding a new, easier to use, overload
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 16:06:27 +00:00
Vadim Zeitlin
4a06b34847 use newly added GetViewRect() instead of trying to guess the list ctrl size ourselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 16:00:29 +00:00
Vadim Zeitlin
11ebea162a added wxListCtrl::GetViewRect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 15:58:41 +00:00
Vadim Zeitlin
ee47181777 attempt to fix another occurence of WS_EX_CONTROLPARENT-related infinite loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-14 10:58:11 +00:00
Václav Slavík
874d12cff7 attempt to fix GUI apps building on OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 20:23:44 +00:00
Václav Slavík
2a87985348 no real changes, moved Robin's changes to bakefile and regenerated using bakefile version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 19:09:50 +00:00
Mattia Barbon
ea172e69cf Compilation fixes for WXWIN_COMPATIBILITY_2_4.
Don't include wx/wx.h, use the much smaller set of
required headers instead.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 16:11:09 +00:00
Mattia Barbon
a7b1654d9d Allow wxSoundStreamESD to be compiled even when no esd.h is
present and make it fail at runtime instead. As ugly as this is,
there currently isn't any way for the application to know if
the class is available.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 16:06:17 +00:00
Mattia Barbon
5abe54648f wxUniversal compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 16:03:28 +00:00
Stefan Csomor
613b6bb90a target_carbon added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 14:09:16 +00:00
Stefan Csomor
8bebc229c7 faster portsetting backpatched
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 14:07:27 +00:00
Stefan Csomor
d16477fd75 classic fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 14:06:08 +00:00
Stefan Csomor
e802b32a26 fixed GetFilenames bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 14:02:54 +00:00
Mattia Barbon
18dbdd3c27 wxUniversal STL-ification.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 12:14:20 +00:00
Gilles Depeyrot
7218d34b0a use SYMROOT instead of DERIVED_SOURCES_DIR
simplified warning messages by displaying relative paths instead of full paths


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 12:01:11 +00:00
Gilles Depeyrot
d941d5efc2 use SYMROOT instead of DERIVED_SOURCES_DIR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 11:59:28 +00:00
Stefan Csomor
7323387564 unicode correction for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 09:00:28 +00:00
Robin Dunn
2dbc444a19 Move more stuff into base for wxMac so that two level namespace dylibs
can be used on OS X.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 00:03:18 +00:00
Robin Dunn
439484990e For OS X detect (based on gcc version) and use -single_module flag.
Also removed the use of the flat namespace flags to prevent symbol
name conflicts when an app loads other dynlibs (that may also contain
libpng for example.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-13 00:01:49 +00:00
Mattia Barbon
4435bd4270 Fix two common case of hybrid build:
standard debugging build with non-debugging MSVCRT
release build with __WXDEBUG__ and non-debugging MSVCRT.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 22:34:06 +00:00
Mattia Barbon
d19d1899fc Try detecting if the CD-ROM I/O implementation in mmedia
has some possibility of working in the host OS..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 21:55:09 +00:00
Mattia Barbon
9fd04ddee8 Various fixes to contrib bakefiles. Regenerated corresponding
Makefile.in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 21:49:46 +00:00
Robin Dunn
d1cc09bb6f The unknown control container should always have the wxTAB_TRAVERSAL
and wxNO_BORDER styles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 21:38:41 +00:00
Václav Slavík
4b289591ff .dsw files for samples must not contain dependencies between core libraries, otherwise static libraries will be linked into other static libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 21:09:11 +00:00
Gilles Depeyrot
59a8eb76bc external Shell Script file to copy setup.h for ProjectBuilder
removed obsolete lexer/parser related actions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 20:29:23 +00:00
Gilles Depeyrot
0b9d8fe18e Shell Script file to copy setup.h for ProjectBuilder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 20:24:53 +00:00
Václav Slavík
3d25fdeee2 import32.lib is always used by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 18:17:56 +00:00
Julian Smart
3265e00f09 Applied patch [ 804995 ] compatibility of dnd sample with various settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 16:12:53 +00:00
Julian Smart
7dbfc030a0 Applied patch [ 804570 ] hidden function in src/msw/ole/dataobj.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 16:10:00 +00:00
Julian Smart
e7222d659b Applied patch [ 805147 ] GDI objects are not deselected from DC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 16:08:47 +00:00
Mattia Barbon
22dcb6df90 Blind fix for library ordering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 09:02:46 +00:00
Stefan Csomor
d0bfeea606 fixing normal font for mac, unicode corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 06:13:19 +00:00
Mattia Barbon
7658b9eb37 wxX11 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 21:36:27 +00:00
Vadim Zeitlin
530c90012a fix for C99-compatible vsnprintf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 21:13:02 +00:00
Mattia Barbon
7db33cc310 Added, documented and used wxGridCellChoiceEditor
taking wxArrayString.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 21:11:01 +00:00
Mattia Barbon
3bdb8629f8 No real changes, just refactoring.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 21:05:19 +00:00
Mattia Barbon
d122f8c745 wxX11 STL-ification.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 21:01:31 +00:00
Mattia Barbon
3c302c07bc Cygwin compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:58:49 +00:00
Mattia Barbon
a2a6aef2bf Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:50:11 +00:00
Stefan Csomor
b7047aa5cb disabling anti-aliasing in carbon builds running under classic (performance)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:49:53 +00:00
Stefan Csomor
789a620add moved setting of internal vars in order to avoid problems in recursing (MoveWindow calling BoundsChanged handlers which in turn call DoMoveWindow again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:33:02 +00:00
Vadim Zeitlin
caff62f22d fix for C99-compatible vsnprintf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:27:39 +00:00
Julian Smart
1c9c480e80 Added new image for dnd sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 19:25:50 +00:00
Václav Slavík
3682ea7d2c link against oleacc.lib (needed by wxUSE_ACCESSIBILITY)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 19:22:18 +00:00
Václav Slavík
e3341ace3e copy data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 19:22:17 +00:00
Stefan Csomor
80965ff88e focus setting must be possible even when not shown yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:59:06 +00:00
Julian Smart
f9668ef0e1 Removed horrible julian.png photo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:41:51 +00:00
Robert Roebling
8b8a8e0e5f Filter out triple click events entirely.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:39:15 +00:00
Stefan Csomor
6d56534934 mouse events added, menu id 0 safety check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:18:05 +00:00
Stefan Csomor
69991fff84 reminder added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:16:16 +00:00
Stefan Csomor
f65d4b83d1 new carbon implementation (unicode support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:14:41 +00:00
Stefan Csomor
6724566552 mouse event handling extended
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 18:03:59 +00:00
Václav Slavík
8fef2a9b08 no need for !wxUSE_GUI test anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 17:02:17 +00:00
Mattia Barbon
76fae052f1 Compilation fix for wxUSE_STL==1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 16:55:24 +00:00
Mattia Barbon
bffd3bf923 mention that wxALIGN_RIGHT swaps text and checkbox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 16:54:01 +00:00
Mattia Barbon
bba965d6d6 Compilation fix for WXWIN_COMPATIBILITY_2_4==1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 16:41:14 +00:00
Julian Smart
8d2474f486 Applied patch [ 800183 ] wxFlexGridSizer::RemoveGrowableRow/Col fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 15:57:37 +00:00
Julian Smart
f8252483ec Applied patch [ 803473 ] wxListCtrl header height bugfix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 15:38:38 +00:00
Stefan Csomor
a6b0ca7571 corrected hit-testing for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 15:37:58 +00:00
Václav Slavík
61a85e847b (blind) fix to last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 15:26:34 +00:00
Julian Smart
654a0fa974 Applied patch [ 791648 ] wxDateTime: note unimplemented methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 14:22:23 +00:00
Julian Smart
4efbec3587 Applied patch [ 804322 ] Fixes for the "life" demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 14:18:00 +00:00
Julian Smart
256b8649ff Add longtool tip for a button in wxToolBar test
Various warning suppressions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 12:52:20 +00:00
Julian Smart
037767538e Applied patch [ 800784 ] Fixes ::wxDirSelector style problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 12:44:24 +00:00
Václav Slavík
3e1d2fe00b removed duplicate entry
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 11:02:52 +00:00
Julian Smart
7afebc8c2e Applied patch [ 771772 ] Crashes when setting icon tooltip longer than 63 characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 10:39:57 +00:00
Julian Smart
85b88942cc Applied patch [ 778625 ] wxSVGFileDC and UNICODE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 10:05:32 +00:00
Julian Smart
25088f1eea Applied patch [ 795491 ] Multimon sample compatibility with various conditions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 10:01:27 +00:00
Julian Smart
0e4acbd463 Applied patch [ 794760 ] Majority of "... hides virtual function ..." removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:58:31 +00:00
Julian Smart
2bbf230a16 Applied patch [ 795423 ] Unicode and warning fixes in contrib/mmedia lib and sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:55:21 +00:00
Julian Smart
c3f815fa63 Applied patch [ 791398 ] unused variables in gizmos contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:50:15 +00:00
Julian Smart
ee0d4b469a Applied [ 792543 ] sample of animate contrib corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:34:43 +00:00
Julian Smart
bd12a395ba Applied patch [ 795542 ] Unicode fixes in richedit sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:33:17 +00:00
Julian Smart
0a0be6d5a8 Applied patch [ 793000 ] "unreachable code" changes in wxrc contrib util
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:30:59 +00:00
Julian Smart
69da0d9946 Applied patch [ 796736 ] unicode and various warnings fixes for configtool util
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:29:25 +00:00
Julian Smart
dc9b3bf7ba Applied patch [ 796696 ] unused variables and unicode fixes in X11 emulator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:27:20 +00:00
Julian Smart
6f661de706 Applied patch [ 791847 ] Missing translation in filedlg.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 09:25:57 +00:00
Julian Smart
6bb934d631 Applied patch [ 796140 ] fixes for building demos/poem in Unicode mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 08:50:16 +00:00
Julian Smart
f2cb8a1725 Applied patch [ 798596 ] console sample in unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 08:48:48 +00:00
Julian Smart
a7fee33ec2 Added wxDisplay doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:24:38 +00:00
Julian Smart
2db98bf520 Applied patch [ 802596 ] warning and error free Open GL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:20:55 +00:00
Julian Smart
5f58391f70 Removed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:18:26 +00:00
Julian Smart
f22cc0b4a5 Applied [ 798206 ] WinCE time.cpp
by Marco Cavallini


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:15:41 +00:00
Mattia Barbon
2341cf5f59 More warning fixes from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 21:09:11 +00:00
Mattia Barbon
0bd4d463e6 Don't declare copystring if WXWIN_COMPATIBILITY_2_4==0
(like in include/wx/utils.h).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 20:57:17 +00:00
Mattia Barbon
c74caa095c Added bakefiles for contrib/utils/convertrc and contrib/utils/wxrcedit
and regenerated makefiles.
  various compilation and warning fixes for recent changes and for
WXWIN_COMPATIBILITY_2_4==0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 20:53:01 +00:00
Gilles Depeyrot
e57f3c5d95 updated project files and compilation options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 20:08:08 +00:00
Gilles Depeyrot
8691eeba23 modified shell script to copy setup0.h into DerivedSource directory
updated project files and compilation options


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 20:06:08 +00:00
Václav Slavík
52de92a8e9 check for m_parentAsWindow!=NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 19:19:01 +00:00
Václav Slavík
5a89970f76 opengl fixes for msvc5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 18:53:57 +00:00
Vadim Zeitlin
521e585ff1 added LVM_SETUNICODEFORMAT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 15:06:44 +00:00
Vadim Zeitlin
bfc8138f91 reverted previous fix for virtual list control with Unicode and MSLU and replaced it with LVM_SETUNICODEFORMAT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 15:05:18 +00:00
Robert Roebling
863136dea6 Test if G_threads already are initialized.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 14:28:29 +00:00
Vadim Zeitlin
fc4fb52856 added missing SetIntPosition() parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 13:37:51 +00:00
Vadim Zeitlin
fa17ced1b5 attempts to fix virtual list control with Unicode and MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 13:20:04 +00:00
Vadim Zeitlin
0376ed5408 documented that wxHSCROLL disables wrapping; added comment to the source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 13:06:48 +00:00
David Elliott
b4f8693cb8 Changed wxWindow::Create to wxControl because wxNotebook is derived from it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 13:00:47 +00:00
Vadim Zeitlin
656562d815 unused param warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 13:00:13 +00:00
Vadim Zeitlin
75d07c0a3a fixed a 'variable could be used uninitialized' warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 12:02:04 +00:00
Vadim Zeitlin
6ba45edb0f added a TODO: clean up WinCE mess/horror
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 11:20:24 +00:00
Mattia Barbon
5f109709da Don't compile smapi.cpp for non-MSW platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 09:14:01 +00:00
Václav Slavík
757e7c678f fixed broken DSP files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 08:36:08 +00:00
Václav Slavík
5d38306bc2 fixed incorrect joining of substituted strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 08:35:00 +00:00
Václav Slavík
506c7b5b69 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 07:55:34 +00:00
Stefan Csomor
5d3a3a5cbc switching off tight borders to have it look properly under 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 07:29:49 +00:00
Stefan Csomor
bf19e3f653 ghost button fix (was calling another baseclass create)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 07:23:55 +00:00
Gilles Depeyrot
bb216e2e45 remove gdb debug related configuration option which causes problems with Apple Developer Tools assembler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 05:48:57 +00:00
Robert Roebling
23c98a6eb0 64-bit patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:22:38 +00:00
Vadim Zeitlin
49d3b775c7 use GetTraits(), not m_traits, in OnAssert()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:20:59 +00:00
Vadim Zeitlin
6a6aa79855 copy milliseconds in Set() too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:17:30 +00:00
Václav Slavík
22cef5668d better way of dealing with EXTRALIBS_xxx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:15:25 +00:00
Václav Slavík
39d85e3caa added contrib/utils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:09:03 +00:00
Mattia Barbon
481721e8cb Applied OpenWatcom fixes from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 20:39:58 +00:00
Mattia Barbon
87728739f2 Various warning and Unicode fixes from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 20:24:34 +00:00
Václav Slavík
432afc17f0 max warnings for wxWindows code, default for 3rd party
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 20:12:38 +00:00
Robert Roebling
a1696b86f8 Upported a number of patches to HEAD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 18:04:57 +00:00
Václav Slavík
69b5cec2b0 applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument (modified to the point of reimplementation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 17:29:11 +00:00
Stefan Csomor
69efd83d47 const ptr fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 16:46:26 +00:00
Stefan Csomor
de923e4f50 crashes fixed, trying to remove erradic redraws when layouting windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:48:52 +00:00
Stefan Csomor
882b047983 wxID_PREFERENCES added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:45:45 +00:00
Stefan Csomor
461fe6e255 implementation changes to closer follow MSW, crashes fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:44:02 +00:00
Václav Slavík
0351877058 added <warnings>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:43:00 +00:00
Stefan Csomor
dbe931ab5e initial creation invisible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:42:28 +00:00
Stefan Csomor
d77d9398e4 trying to avoid redraw problems at wrong places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:38:03 +00:00
Stefan Csomor
fe779e4047 fixing Update, attempt to speed redrawing by making embedded controls invisible (leading to lesser nested redraws)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:37:19 +00:00
Stefan Csomor
46d0c7072f when memory dumps out debug info, lookups can go wrong, since the list is not there anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:36:22 +00:00
Stefan Csomor
f825dcd123 fix for CW non unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:34:15 +00:00
Stefan Csomor
5524d92aaa wxID_PREFERENCES added for the preferences menu item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 15:32:35 +00:00
Robert Roebling
827e7a4874 Applied patch for better sizing of bitmap buttons.
Applied patch for correct order of activate and mouse down events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 13:05:50 +00:00
Robert Roebling
411bdf7415 Applied patch for better pattern support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 11:59:25 +00:00
David Elliott
42036ca82a Implement NSMenuValidation protocol for the wxNSMenuItemTarget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 20:03:16 +00:00
David Elliott
f5382a2f00 Remove wxASSERT(!m_windowKey) and wxASSERT(!m_windowMain). When a window
is destroyed it doesn't resign key or main status.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 19:44:40 +00:00
David Elliott
677d7f2414 Use wxStripMenuCodes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 19:42:35 +00:00
David Elliott
11573ad882 Implement wxSpinButton (except up/down events)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 19:03:31 +00:00
David Elliott
e0c691d13c Provide target/action mechanism for subclasses to use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 19:00:45 +00:00
David Elliott
b6567e32ee When using a non-subclassed NSControl, use a new wxNonControlNSControl
subclass which implements drawRect: like wxPoserNSView does.
If this is not done, NSControl simply eats the drawRect: message.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 18:14:57 +00:00
Václav Slavík
e09c7b2d62 forgot to commit regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 17:11:29 +00:00
David Elliott
b66e98539f Implement (sort-of) non-client wxWindowDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 15:42:40 +00:00
David Elliott
514e7b7bf8 Added virtual GetNonClientNSView()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 15:37:58 +00:00
David Elliott
080c7d56e0 * Added NSWindowStyleForWxStyle static method
* Create(): Handle window styles and initial frame size


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 14:51:38 +00:00
Stefan Csomor
f7476b53e6 setter fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 14:21:36 +00:00
Mattia Barbon
f4a3e0a956 Added src/motif/xmcombo/xmcombo.c.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 10:42:29 +00:00
Mattia Barbon
550223b248 Removing makegen an projgen files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-07 20:29:46 +00:00
Mattia Barbon
73d617c9c7 Removing makegen and projgen, part #1: removing references
in other parts of wxWindows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-07 20:23:55 +00:00
Stefan Neis
d4ca5c8c7b Insure that messages are posted to the main threads event loop,
instead of sending them to the thread-local event loop
        (which typically does not exist under wxWindows).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-07 17:50:12 +00:00
Stefan Neis
ad0500fb78 Initialize PM subsystem in every thread, to enable sending messages to the GUI.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-07 12:49:04 +00:00
Stefan Neis
2e896473d8 Unified with Unix version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 22:25:16 +00:00
Stefan Neis
f4a917a7d5 wxOS2: Added mdig.{cpp, h}.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 21:47:19 +00:00
David Elliott
0ca6987db2 Use an NSImageView instead of an NSView (nothing works yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 19:12:04 +00:00
David Elliott
7e41e564c6 Use an NSSlider instead of an NSView (nothing works yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 19:11:26 +00:00
David Elliott
1f4e686615 Override CocoaSetEnabled because it's not an NSControl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 19:10:22 +00:00
David Elliott
3529fcc96a wxCocoa: CodeWarrior (like GCC) mangles struct X and @class X identically.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 17:36:51 +00:00
David Elliott
3099646e86 wxCocoa: Added NSNotification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 17:32:21 +00:00
Stefan Neis
afbfef69a3 Use function table instead of direct references to GSocket functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 16:37:02 +00:00
David Elliott
f154ff6018 Implement wxChoice including sorting and client data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-06 00:33:02 +00:00
Mattia Barbon
a5e14fbf1a Updated Italian translation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 20:26:36 +00:00
David Elliott
363f7de02b Implement wxGauge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 18:40:00 +00:00
David Elliott
aaa5ab05af Implement wxApp::Yield
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 18:29:15 +00:00
David Elliott
faad188707 Override CocoaSetEnabled. NSProgressIndicator is not an NSControl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 18:19:11 +00:00
David Elliott
1981118d4b Works a little better when you remember to say "virtual"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 15:29:17 +00:00
David Elliott
bc8eaeb38a Implement the hashmap for NSMenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 15:09:02 +00:00
David Elliott
af27ce842e Changed CocoaNotification parameter names to notification from userInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:59:51 +00:00
David Elliott
bcf0148786 Added ability to observe NSMenu notifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:50:31 +00:00
Stefan Csomor
061174e31a selection for DeleteAllPages corrected, images scaleing in order to avoid crashes under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:44:48 +00:00
Stefan Csomor
e778ad8607 commented section removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:42:17 +00:00
Stefan Csomor
258e4e914f todo added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:41:12 +00:00
Stefan Csomor
b657d5dbee removing scroll flags before instantiation the base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:38:03 +00:00
David Elliott
605c7e7ed8 * Move m_cocoaNSMenu out of wxCocoaNSMenu and into wxMenu and wxMenuBar
* Comment out wxPoserNSMenu (it's not needed for now, may never be)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 14:00:53 +00:00
David Elliott
da02681123 Set the window's title
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 03:30:28 +00:00
David Elliott
97351e1704 wxMenuBar:
* Add the application (bold) menu to the NSMenu used for menubars
* Rework Insert, Remove, and GetLabelTop to work with indices by
  retrieving the wxMenu then working from there to find the Cocoa index.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 03:01:13 +00:00
David Elliott
3581295575 * Set the window's title
* setHidesOnDeactivate: NO


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 02:53:39 +00:00
David Elliott
162c4aada6 CodeWarrior Obj-C++ requires explicit casts from id to Objective-C types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 02:51:29 +00:00
David Elliott
4788596812 When a modal dialog is shown and the app isn't running, run the event
loop manually until it is out of events.  This will allow the application
to let the Dock know it has completed startup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 02:48:49 +00:00
Stefan Csomor
83901ec20c added live resizing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 02:07:28 +00:00
David Elliott
456fef85bb Implement Cocoa_canBecomeMainWindow to say YES to Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 01:40:52 +00:00
David Elliott
24c7767fc8 * Added GetAppMenuBar
* Removed Show
* Labeled (Attach|Detach)MenuBar as virtual
* Added SetMenuBar
* Implement (Attach|Detach)MenuBar using the wxMenuBarManager


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 01:39:55 +00:00
David Elliott
af367f4640 Add support for wxMenuBarManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-05 01:34:57 +00:00
Mattia Barbon
d6c6a32321 Added a couple of wxPerl notes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 22:20:16 +00:00
Mattia Barbon
78e6050be8 Fix and testcase for wxString::rfind bug I introduced.
Patch by Robert Vazan.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 21:59:48 +00:00
David Elliott
33faea0a0d * Added virtual GetAppMenuBar() which returns the app-wide menubar which
would be appropriate for this window, or NULL if the manager should decide
* Added Become/Resign Main handlers
* For all Become/Resign Main/Key handlers, notify the menubar manager


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 21:16:41 +00:00
David Elliott
8fc821cccf * Added delegate notifications for Become/Resign Main
* Added canBecomeMainWindow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 20:59:30 +00:00
David Elliott
1a249e049a wxCocoa: Added mbarman.(mm|h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 19:22:00 +00:00
David Elliott
268bec5aee Added wxMenuBarManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 19:19:03 +00:00
Václav Slavík
cee0eb6e66 added data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 18:09:53 +00:00
Stefan Csomor
8f2b1cfd39 log changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 16:18:07 +00:00
David Elliott
78868257aa #if wxUSE_UNICODE instead of #if defined(wxUSE_UNICODE)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 13:11:39 +00:00
Stefan Csomor
459f2add90 macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 12:26:52 +00:00
Stefan Csomor
321239b6c4 macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:28:39 +00:00
Stefan Csomor
3ff066a4ec macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:19:40 +00:00
Stefan Csomor
8805dbab72 macro naming changes, delegate api calls getting property info, object info exposed for beforewriteobject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:12:11 +00:00
Stefan Csomor
9dabddc292 naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:08:25 +00:00
Mattia Barbon
204e4cd6ee Regenerated makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 00:01:59 +00:00
Mattia Barbon
8ba95a1813 Regenerated makefiles in the correct place.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 20:27:58 +00:00
Václav Slavík
a93aa55a00 fixed win32res
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 20:16:10 +00:00
Mattia Barbon
b521a6f94b Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 17:39:27 +00:00
Mattia Barbon
f1e938e09c Added missing bakefiles in utils/* and regenerated
(autoconf) Makefile.in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 17:34:00 +00:00
Mattia Barbon
78901ea99c Oops. Check in the correct Makefile.in.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 17:19:48 +00:00
Chris Elliott
83a1aa23c0 fix makefile for digitalmars to build taskbar sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 14:35:49 +00:00
Chris Elliott
640f7e6642 fix makefile for digitalmars to build joytest sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 14:16:40 +00:00
Chris Elliott
0a360e4836 fix makefile for digitalmars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 13:59:53 +00:00
Stefan Csomor
79fdfb3506 added GetBaseClassName1 and 2 for memory.cpp compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 10:02:47 +00:00
David Elliott
911e17c6cf CodeWarrior Obj-C++ requires explicit casts from id to Objective-C types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-02 19:15:44 +00:00
David Elliott
449c567346 Support precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-02 19:03:22 +00:00
David Elliott
0411b8647b * Use wxTopLevelWindow::Show() for modeless dialogs
* Maintain m_isShown for modal dialogs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-02 13:00:28 +00:00
David Elliott
cbb2499e71 Set the m_isShown flag appopriately
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-02 12:54:34 +00:00
Václav Slavík
5d9d22fe08 accept focus, keyboard can be used for navigation (patch 798098)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 20:59:57 +00:00
Mattia Barbon
e21011866e Corrected statements about wxString correctly handling
embedded '\0' characters.
  Fixed various wxString::*find* methods (patch by Robert Vazan),
plus added missing overloaded variants of find_first/last_(not_)of.
Added more tests in console sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 20:20:21 +00:00
Robin Dunn
78d774068b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 20:01:55 +00:00
Robin Dunn
704f9c00cd Changed #include order to correct a compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 20:01:10 +00:00
Robin Dunn
877d6bae5e Corrected a return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:59:50 +00:00
Robin Dunn
5c6c31763f Added handler for WM_PRINT to assist with offscreen drawing of widgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:56:28 +00:00
Robin Dunn
8c14bc9170 Fixed style setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:54:41 +00:00
Robin Dunn
6bb000ec67 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:53:54 +00:00
Mattia Barbon
241ba96cfa Regenerated Makefile.in.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:53:05 +00:00
Robin Dunn
208218898b More experiments with wxDrawWindowOnDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:52:45 +00:00
Robin Dunn
6e4d60a3b8 Work around a bug in the Carbon headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:41:12 +00:00
Robin Dunn
39b9cdaff4 Check wxUSE_DEPRECATED before including its headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 19:32:16 +00:00
Mattia Barbon
d2fa3a370d Regenerated makefile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 17:19:54 +00:00
Jouk Jansen
16d54adb37 Committing in .
removing some obsolete CLEAR members

 Modified Files:
 	wxWindows/samples/richedit/wxlwindow.cpp
 	wxWindows/utils/dialoged/src/reseditr.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 14:51:42 +00:00
Jouk Jansen
1cc4f822d3 Committing in .
Update OpenVMS compile support

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/generic/notebook.cpp
 	wxWindows/src/gtk/notebook.cpp wxWindows/src/univ/descrip.mms
 	wxWindows/src/univ/notebook.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 14:47:00 +00:00
Stefan Csomor
da31cbc4ef only work on the focus if the control is shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 13:11:59 +00:00
Václav Slavík
72b2d7514d re-added minimal.dsw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 12:09:16 +00:00
Stefan Neis
48c82007d3 Added missing include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 22:35:24 +00:00
Stefan Neis
a318e447a1 Added a couple of files that were missing for wxOS2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 22:27:24 +00:00
Stefan Neis
bf341e6e6c Removed duplicate declaration of wxEntry.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:44:48 +00:00
Stefan Neis
258836fa25 Updated to current API.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:39:52 +00:00
Stefan Neis
3979bf6b1f Updated API to current state of wxWindows (int -> size_t).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:37:00 +00:00
Vadim Zeitlin
8f387d13ff don't return \n from GetLineText() neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:09:27 +00:00
Vadim Zeitlin
60ab0c52e3 don't return \r from GetLineText()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:02:21 +00:00
Stefan Neis
51a7e6af00 Added missing include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 21:00:00 +00:00
Stefan Neis
28410cdcee Added missing include to resource file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 20:55:56 +00:00
Stefan Neis
4fe9efc1b9 Added missing include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 20:52:26 +00:00
Stefan Neis
0093fe11c5 Cleaned up remains of outdated 3D effect handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 20:08:49 +00:00
Stefan Neis
a04be86ee4 Fixed IMPLEMENT_DYNAMIC_CLASS usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 19:56:53 +00:00
Stefan Neis
50528a1dbe Added missing include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 19:54:41 +00:00
Stefan Neis
9cd036338d Added missing include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 19:41:52 +00:00
Stefan Neis
ceb8f94a96 Fixed includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 19:01:12 +00:00
Stefan Neis
459073a907 Removed some code duplicating wxAppBase functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 18:51:04 +00:00
Stefan Neis
21323df7fe Fixed return type of GetPageCount (int -> size_t).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 18:25:53 +00:00
Stefan Neis
621ccd8a82 Fixed AppTraits handling on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 18:15:10 +00:00
Stefan Csomor
3c589c7f47 Carbon Event Mouse Moved handler changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 15:35:32 +00:00
Stefan Csomor
bd7641107a Carbon Event Mouse Moved handler added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 15:33:02 +00:00
Mattia Barbon
912fe32590 Add wxNet dependency.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 14:29:07 +00:00
Vadim Zeitlin
b653e655aa no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 13:47:11 +00:00
Vadim Zeitlin
29e1f68933 backport the sizers change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 13:30:39 +00:00
Vadim Zeitlin
85e5cfc952 fix redistribution of the extra space between sizer items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 13:29:28 +00:00
Vadim Zeitlin
ccf5c8a88c undid the last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 12:54:48 +00:00
Robert Roebling
f4e0be4f62 Prevent wxMac from creating an epmpty bitmap in a toolbar
if all we want is a separator.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 12:05:49 +00:00
Vadim Zeitlin
2a68b7a07d compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 23:11:46 +00:00
Vadim Zeitlin
708c45a6ce return the index of the inserted/appended item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 23:03:07 +00:00
Vadim Zeitlin
f43c777175 use SetClientSize(), not SetSize() in Fit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 22:39:56 +00:00
Mattia Barbon
3ac35b57a6 More compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 21:06:50 +00:00
Vadim Zeitlin
c222be41e7 fixed return value of Disable() (bug 795630)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 20:56:47 +00:00
Stefan Neis
f877815e1b Fixed several bugs in threading code for OS/2. Thread sample now working.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 20:44:14 +00:00
Stefan Csomor
ba87f54c0d made Update be window local (before was updating the entire window), ScrollWindow now scrolls also invalidated areas and in the end does an Update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 20:32:46 +00:00
Stefan Csomor
3066bdd62a removing all updates specially for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 20:30:53 +00:00
Mattia Barbon
917ad696df Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 17:55:22 +00:00
Václav Slavík
d10382abd5 removed BuildRequires: wx-base-devel from RPM .spec files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 12:30:09 +00:00
Václav Slavík
03a299ae02 $ causes diff problems here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 10:28:29 +00:00
Václav Slavík
c3b87b2e3c moved compat content to formats, there will be more wx-specific formats
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 10:12:50 +00:00
Václav Slavík
8ce0312ea0 moved compat content to formats, there will be more wx-specific formats
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-30 10:02:28 +00:00
Václav Slavík
3caa34b771 removed caching from wxInternetFSHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 22:54:45 +00:00
Mattia Barbon
d8771ac734 Fixed bug introduced in fs_zip.cpp when replacing wxHashTableLong
with wxHashMap.
  Made wxHashMap constructor explicit to prevent similar errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 20:10:32 +00:00
Stefan Csomor
584e607406 added WX_IMPLEMENT_PROPERTY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 19:07:58 +00:00
David Elliott
aa992c594e Rename some of the Cocoa methods to reflect that they are implemented
by the NSWindow delegate.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 14:59:04 +00:00
David Elliott
eb3426e77a Implement windowShouldClose: in delegate instead of class poser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 14:15:59 +00:00
David Elliott
78c67cb642 Use a delegate instead of manually adding notifications. Not only is this
less code, but a delegate will be required for future functionality.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 14:10:23 +00:00
Václav Slavík
5af11a9413 Content-Type parsing should be case insensitive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 09:59:00 +00:00
Vadim Zeitlin
1fa29bdc25 implemented IsModified() and DiscardEdits()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 00:11:09 +00:00
Vadim Zeitlin
6841d412ae don't reset timer interval to 0 in Stop(), this prevents Start(-1) from working
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-29 00:05:49 +00:00
Mattia Barbon
e6a14306d1 Added X11 headers used by wxMotif. Removed nonexistsnt
wx/motif/settings.h. Only affects "make install" correctness.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:55:23 +00:00
Mattia Barbon
8879354854 Don't crash in wxControl::GetLabel when getting the label
fails (perhaps because the widget is not realized?).
  Correct wxRTTI information for wxFrame: it derives from
wxTopLevelWindow, not wxWindow.
  Don't try setting Widget size to 0, because it will fail: set
it to 1 instead which is exactly as sensible, but does not crash.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:39:37 +00:00
Mattia Barbon
93c83507aa wxString::rfind fixed for wxUSE_STL=0 from Robert Vazan.
Added missing wxArrayString::reserve.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:32:06 +00:00
Mattia Barbon
b2bb920ff6 wxHashMap does not take the key type as constructor argument.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:26:53 +00:00
Václav Slavík
0b92df7943 correction for include name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:24:01 +00:00
Václav Slavík
2da409423d switched to using bakefile_gen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 20:23:28 +00:00
Václav Slavík
7b5dfe6ce6 gl lib dependency fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 19:59:30 +00:00
Václav Slavík
30bb4ef566 _UNICODE instead of wxUSE_UNICODE=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 19:56:55 +00:00
Václav Slavík
3629838adb added bakefile_gen support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 19:51:53 +00:00
Václav Slavík
a48abb85d1 data copying fixes for configtool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 19:18:06 +00:00
Václav Slavík
1fe1a4dc25 renamed netutils.bkl to net.bkl, to simplify bakefile_gen use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 18:07:06 +00:00
Václav Slavík
d17bdeab1d added hardcoded values for project files, so that they don't have to be passed on command line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 18:06:46 +00:00
David Elliott
2fc2d511d0 Send all menu item actions to a dedicated target. This is to ensure
the actions always make it to the proper wxFrame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 17:49:51 +00:00
Václav Slavík
0ff1f245a9 make dist fixes belong here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 17:13:21 +00:00
David Elliott
26785f01d0 * Clean up the includes and use wxprec.h
* Wrap toolbar related code in wxUSE_TOOLBAR
* m_frameToolBar was used where m_frameStatusBar should have been.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 16:37:18 +00:00
David Elliott
1d2412f77b CreateToolBar/SetToolBar wrapped in #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 16:34:26 +00:00
Stefan Csomor
ea16189569 -1 , -1 for SetSelection improved
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 14:42:02 +00:00
Václav Slavík
afe06a5457 unknown container now accepts wxNO_FULL_REPAINT_ON_RESIZE flag (John Anderson)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 10:40:43 +00:00
Václav Slavík
56572188ee wxCheckList -> wxCheckListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-28 09:36:54 +00:00
Julian Smart
036971cc8c Copy some missing samples, and contrib for Motif/Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 21:27:25 +00:00
Julian Smart
789f8e6ad4 Do archive name case conversion for wxMac and wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 20:22:13 +00:00
Stefan Neis
6691d73700 Don't treat OS/2 as a Unix-like system in this particular file.
This also simplifies some of the #ifdef statments. :-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:57:17 +00:00
Stefan Csomor
ffca575c83 WX_EVENT_PROPERTY instead of WX_DELEGATE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:42:14 +00:00
Stefan Neis
64621b078d Never use unix/mimetype.h on OS/2. I'm not exactly sure, if that's the
right thing to do for the X11 ports when running them on OS/2, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:39:24 +00:00
Stefan Neis
15732d07e7 Want to use wxDir::HasSubDirs on OS/2 with gcc, too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:19:20 +00:00
Václav Slavík
ed4ccecd55 wxUSE_UNICODE=1 -> _UNICODE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:09:15 +00:00
Václav Slavík
fd3eb307a7 wxLayout.cpp is data file as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:08:18 +00:00
Stefan Csomor
c5ca409b6a event exposure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 17:53:15 +00:00
Stefan Csomor
9d39cef7ef event exposure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 17:29:58 +00:00
Stefan Csomor
1d73f41603 added support for range types to runtime depersister
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 17:11:39 +00:00
Stefan Csomor
8edb7cd500 added range of types to delegate type info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 17:05:59 +00:00
Stefan Csomor
4177a99c30 added range of types for delegate type info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 17:02:51 +00:00
Stefan Csomor
9a75ecf64a constness for accessors of enum data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 12:17:42 +00:00
Stefan Csomor
25474dcade changed getters for enum to const, GetEventClass to the delegate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 08:10:02 +00:00
Robin Dunn
e55c4dd1b1 Latest distutils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 00:20:37 +00:00
Robin Dunn
21870a5d8d WXMAKINGDLL --> WXMAKINGDLL_CORE and also fixed name of resources file
in multi-lib builds (so it doesn't look for "_core" in the name.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 21:21:50 +00:00
Robin Dunn
b380439d52 Better #if checks for mac in ProcessPlatformProperty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 21:19:30 +00:00
Václav Slavík
84389518ba __WINDOWS__, not __WXMSW__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 20:56:20 +00:00
Chris Elliott
377c68c5f6 update docs for d_mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 19:35:48 +00:00
Chris Elliott
f1e269209a fix for d_mars 8.35
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 19:32:45 +00:00
David Elliott
5aa417d57c Send activate/deactivate events for become/resign key
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 19:30:10 +00:00
David Elliott
720e01c312 Added a notification observer for NSWindow. Observe the become key and
resign key notifications. (window activation in wxWindows parlance)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 19:28:35 +00:00
Chris Elliott
83f0bdff31 fix makefile (changed filelist)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 19:28:25 +00:00
Chris Elliott
02490909dc fix minor change to Borland intall instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 09:07:01 +00:00
Chris Elliott
6bddef3669 fix minor change to Borland intall instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 08:28:41 +00:00
Chris Elliott
536284403d remove references to Borland IDE and Cbuilder files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 08:21:09 +00:00
Julian Smart
2e9a77b6eb Minor tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 02:27:43 +00:00
9418 changed files with 13268 additions and 3384029 deletions

View File

@@ -1,64 +0,0 @@
system.list
bin
.gdb_history
Test
config.cache
configarg.cache
config.status
system.list
linux.system.cache
wx-config
config.log
linux-gnu.system.cache
*.dsp
*.dsw
*.plg
*.opt
*.aps
*.ncb
*.pro
*.opt
*.d
*.swp
*.swo
Release
Debug
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
DebugUnicodeDLL
UnivRelease
UnivDebug
BaseRelease
BaseDebug
BaseReleaseDLL
BaseDebugDLL
robert
stamp-h.in
Makefile
configure
setup.h
stamp-h
libtool
aclocal.m4
base
gtk
gtk2
motif
win32
x11
univ
univ-debug
univ-release
base-debug
gtk-debug
motif-debug
win32-debug
base-release
gtk-release
motif-release
win32-release
*tags
log
univtags.cmd
.DS_Store

View File

@@ -1,261 +0,0 @@
------------------------------------------------------------------------
How to build the sources from CVS
------------------------------------------------------------------------
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
etc. alongside these instructions.
I) Windows using plain makefiles
----------------------------------------
a) If using Microsoft Visual C++ 5.0 or 6.0
Ensure that the command-line compiler and tools (including
nmake) are installed and ready to run. Depending on your
installation there may be a batch file (named something like
VCVARS32.BAT) that needs to be run to set correct environment
varaibles and PATH entries.
Continue with item c) below.
b) If using the MinGW or Cygwin compilers
You can get MinGW from http://www.mingw.org/
Cygwin is available at http://sources.redhat.com/cygwin/
If you are using Cygwin or MinGW together with the MSYS environment, you
can build the library using configure (see "Unix ports" and
"Windows using configure" below). You can also
build wxWindows without configure using native makefile, but only with
MinGW. Using Cygwin together with Windows makefile is no longer supported.
If building with Mingw without configure:
-> Set your path so that it includes the directory
where your compiler and tools reside
-> Make sure you have GNU Make installed. It must be Windows native version.
Download it from http://www.mingw.org, the executable will be called
mingw32-make.exe.
-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
have to change variable GCC_VERSION in config.gcc (see msw/install.txt
for details).
If using configure, Unix instructions apply.
c) Build instructions
-> Assumming that you installed the wxWindows sources
into c:\wxWin
-> Copy c:\wxWin\include\wx\msw\setup0.h
to c:\wxWin\include\wx\msw\setup.h
-> Edit c:\wxWin\include\wx\msw\setup.h to choose
the features you would like to compile wxWindows with[out].
and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0
-> type: cd c:\wxWin\build\win32
-> type: make -f makefile.gcc (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++)
etc.
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/
See docs/msw/install.txt for details; in brief
-> type cd %WXWIN%\build\win32
-> type make -f makefile.bcc
You can customize many things in the build process, detailed description is
in docs/msw/install.txt.
II) Unix ports
--------------
Building wxGTK or wxMotif completely without configure
won't ever work, but there is now a new makefile system
that works without libtool and automake, using only
configure to create what is needed.
In order to create configure, you need to have the
GNU autoconf package (version > 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf). Note that you usually don't
need to do this because configure is included in cVS.
Set WXWIN environment variable to the base directory such
as ~/wxWindows (this is actually not really needed).
-> type: export WXWIN=~/wxWindows
-> type: md mybuild
-> type: cd mybuild
-> type: ../configure --with-motif
or type: ../configure --with-gtk
-> type: make
-> type: su <type root password>
-> type: make install
-> type: ldconfig
-> type: exit
Call configure with --disable-shared to create a static
library. Calling "make uninstall" will remove the installed
library and "make dist" will create a distribution (not
yet complete).
III) Windows using configure
----------------------------------------
wxWindows can be built on Windows using MSYS (see
http://www.mingw.org/), which is a POSIX build environment
for Windows. With MSYS you can just ./configure && make (see also VII,
Unix->Windows cross-compiling using configure).
Of course, you can also build the library using plain makefiles (see
section I).
IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
----------------------------------------
Refer to the readme.txt and install.txt files in docs/mac to build
wxWindows under Classic Mac OS using CodeWarrior.
If you are checking out the CVS sources using cvs under Mac OS X and
compiling under Classic Mac OS:
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
CodeWarrior may ignore them. Checking out the CVS sources using cvs
under Mac OS X creates untyped files which can lead to compilation
errors under CodeWarrior which are hard to track down.
- convert the xml files to CodeWarrior binary projects using the supplied
AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
V) MacOS X using configure and the Developer Tools
----------------------------------------
You need to have the Developer Tools installed. If this is not the case,
you will need to register at the Apple Developer web site (this is a free
registration) in order to download the Developer Tools installer.
In order to create configure, you need to have the
GNU autoconf package (version >= 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf).
-> type: mkdir macbuild
-> type: cd macbuild
-> type: ../configure --with-mac
or type: ../configure
-> type: make
VI) OS/2
----------------------------------------
VII) Unix->Windows cross-compiling using configure
--------------------------------------------------
First you'll need a cross-compiler; linux glibc binaries of MinGW and
Cygwin (both based on egcs) can be found at
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
based on the latest MinGW release can be found at
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
Otherwise you can compile one yourself.
[ A Note about Cygwin and MinGW: the main difference is that Cygwin
binaries are always linked against cygwin.dll. This dll encapsulates most
standard Unix C extensions, which is very handy if you're porting unix
software to windows. However, wxMSW doesn't need this, so MinGW is
preferable if you write portable C(++). ]
You might want to build both Unix and Windows binaries in the same source
tree; to do this make subdirs for each e.g. unix and win32. If you've
already build wxWindows in the main dir, do a 'make distclean' there,
otherwise configure will get confused. (In any case, read the section 'Unix
using configure' and make sure you're able to build a native wxWindows
library; cross-compiling errors can be pretty obscure and you'll want to be
sure that your configure setup is basically sound.)
To cross compile the windows library, do
-> cd win32
(or whatever you called it)
Now run configure. There are two ways to do this
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
where --build= should read whatever platform you're building on. Configure
will notice that build and host platforms differ, and automatically prepend
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
The other way to run configure is by specifying the names of the binaries
yourself:
-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
../configure --host=i586-mingw32 --with-mingw
(all assuming you're using MinGW)
By default this will compile a DLL, if you want a static library,
specify --disable-shared.
Type
-> make
and wait, wait, wait. Don't leave the room, because the minute you do there
will be a compile error :-)
NB: if you are using a very old compiler you risk to get quite a few warnings
about "ANSI C++ forbids implicit conversion from 'void *'" in all places
where va_arg macro is used. This is due to a bug in (some versions of)
MinGW headers which may be corrected by upgrading your compier,
otherwise you might edit the file
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
(instead of egcs-2.91.57 you may have something different), searching for
the lines
/* Define __gnuc_va_list. */
#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
typedef char *__gnuc_va_list;
#else
typedef void *__gnuc_va_list;
#endif
#endif
and adding "|| defined(_WIN32)" to the list of platforms on which
__gnuc_va_list is char *.
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
(or just libwx_msw.a if you opted for a static build).
Now try building the minimal sample:
-> cd samples/minimal
-> make
and run it with wine, for example (or copy to a Windows box)
-> wine minimal.exe
If all is well, do an install; from win32
-> make install
Native and cross-compiled installations can co-exist peacefully
(as long as their widget sets differ), except for wx-config. You might
want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
Cross-compiling TODO:
---------------------
- resource compiling must be done manually for now (should/can we link the
default wx resources into libwx_msw.a?) [ No we can't; the linker won't
link it in... you have to supply an object file ]
- static executables are HUGE -- there must be room for improvement.

18263
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,600 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl
dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl Vadim Zeitlin and Ron Lee
dnl
dnl This script is under the wxWindows licence.
dnl
dnl Version: $Id$
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl macros to find the a file in the list of include/lib paths
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
break
fi
done
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1 /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
done
done
])
dnl ---------------------------------------------------------------------------
dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
fi
fi
])
dnl ---------------------------------------------------------------------------
dnl Path to link, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_LINK_PATH_EXIST],
[
echo "$2" | grep "\-L$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link=""
else
ac_path_to_link=" -L$1"
fi
])
dnl ===========================================================================
dnl C++ features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
if test "$cross_compiling" = "yes"; then
ifelse([$2], , :, [$2])
else
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS(iostream)
if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
AC_LANG_RESTORE
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
dnl
dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_BOOL],
[
AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(
[
],
[
bool b = true;
return 0;
],
[
wx_cv_cpp_bool=yes
],
[
wx_cv_cpp_bool=no
]
)
AC_LANG_RESTORE
])
if test "$wx_cv_cpp_bool" = "yes"; then
AC_DEFINE(HAVE_BOOL)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
dnl keyword and defines HAVE_EXPLICIT if this is the case
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_EXPLICIT],
[
AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
wx_cv_explicit,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
dnl do the test in 2 steps: first check that the compiler knows about the
dnl explicit keyword at all and then verify that it really honours it
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
],
[
return 0;
],
[
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
static void TakeFoo(const Foo& foo) { }
],
[
TakeFoo(17);
return 0;
],
wx_cv_explicit=no,
wx_cv_explicit=yes
)
],
wx_cv_explicit=no
)
AC_LANG_RESTORE
])
if test "$wx_cv_explicit" = "yes"; then
AC_DEFINE(HAVE_EXPLICIT)
fi
])
dnl ---------------------------------------------------------------------------
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_C_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian,
[ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros
#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
if test $ac_cv_c_bigendian = unknown; then
AC_TRY_RUN([main () {
/* Are we little or big endian? From Harbison&Steele. */
union
{
long l;
char c[sizeof (long)];
} u;
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi])
if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
fi
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)
fi
])
dnl ---------------------------------------------------------------------------
dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_ARG_CACHE_INIT],
[
wx_arg_cache_file="configarg.cache"
echo "loading argument cache $wx_arg_cache_file"
rm -f ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}
])
AC_DEFUN([WX_ARG_CACHE_FLUSH],
[
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
])
dnl this macro checks for a three-valued command line --with argument:
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
AC_DEFUN([WX_ARG_SYS_WITH],
[
AC_MSG_CHECKING([for --with-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
elif test "$withval" = no; then
ac_cv_use_$1='$3=no'
elif test "$withval" = sys; then
ac_cv_use_$1='$3=sys'
elif test "$withval" = builtin; then
ac_cv_use_$1='$3=builtin'
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
elif test "$$3" = no; then
AC_MSG_RESULT(no)
elif test "$$3" = sys; then
AC_MSG_RESULT([system version])
elif test "$$3" = builtin; then
AC_MSG_RESULT([builtin version])
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
])
dnl this macro checks for a command line argument and caches the result
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
AC_DEFUN([WX_ARG_WITH],
[
AC_MSG_CHECKING([for --with-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
AC_DEFUN([WX_ARG_ENABLE],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
if test "$enableval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
found_versioning=no
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
dnl in the script.
dnl dnl Check for known non-gcc cases:
dnl case "${host}" in
dnl *-*-solaris2* )
dnl if test "x$GCC" != "xyes" ; then
dnl LDFLAGS_VERSIONING="-M $1"
dnl found_versioning=yes
dnl fi
dnl ;;
dnl esac
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
if test $found_versioning = no ; then
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
fi
])
dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl test for availability of iconv()
dnl ---------------------------------------------------------------------------
dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const,
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
extern
#ifdef __cplusplus
"C"
#endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
],
[],
wx_cv_func_iconv_const="no",
wx_cv_func_iconv_const="yes"
)
)
iconv_const=
if test "x$wx_cv_func_iconv_const" = "xyes"; then
iconv_const="const"
fi
AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const,
[Define as const if the declaration of iconv() needs const.])
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
])
dnl ---------------------------------------------------------------------------
dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
dnl ---------------------------------------------------------------------------
dnl WX_SYS_LARGEFILE_TEST
dnl
dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
dnl arithmetic properly but this failed miserably with gcc under Linux
dnl whereas the system still supports 64 bit files, so now simply check
dnl that off_t is big enough
define(WX_SYS_LARGEFILE_TEST,
[typedef struct {
unsigned int field: sizeof(off_t) == 8;
} wxlf;
])
dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
define(WX_SYS_LARGEFILE_MACRO_VALUE,
[
AC_CACHE_CHECK([for $1 value needed for large files], [$3],
[
AC_TRY_COMPILE([#define $1 $2
#include <sys/types.h>],
WX_SYS_LARGEFILE_TEST,
[$3=$2],
[$3=no])
]
)
if test "$$3" != no; then
wx_largefile=yes
AC_DEFINE_UNQUOTED([$1], [$$3])
fi
])
dnl AC_SYS_LARGEFILE
dnl ----------------
dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work.
dnl For more details about this brain damage please see:
dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
AC_DEFUN([AC_SYS_LARGEFILE],
[AC_ARG_ENABLE(largefile,
[ --disable-largefile omit support for large files])
if test "$enable_largefile" != no; then
dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
dnl _LARGE_FILES -- for AIX
wx_largefile=no
WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
if test "x$wx_largefile" != "xyes"; then
WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
fi
AC_MSG_CHECKING(if large file support is available)
if test "x$wx_largefile" = "xyes"; then
AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
fi
AC_MSG_RESULT($wx_largefile)
fi
])
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_const_cast.html
dnl
AC_DEFUN([AC_CXX_CONST_CAST],
[AC_CACHE_CHECK(whether the compiler supports const_cast<>,
ac_cv_cxx_const_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(,[int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;],
ac_cv_cxx_const_cast=yes, ac_cv_cxx_const_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_const_cast" = yes; then
AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
fi
])

1766
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * addbookm_xpm[] = {
"16 15 3 1",
" c None",
". c #000000",
"+ c #C3F9BD",
" .. ",
" .. ",
" .. . ",
"........ .+. ",
"........ .+++. ",
" .. .+++++. ",
" .. .+++++. ",
" .. .+++++. ",
" .+++++. ",
" .+++++. ",
" .+++++. ",
" ....++. ",
" .+. ",
" .. ",
" . "};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char * back_xpm[] = {
"16 16 5 1",
" c None",
". c #000000",
"+ c #C0E4CB",
"@ c #77C490",
"# c #808080",
" ",
" ",
" . ",
" .. ",
" .+. ",
" .++........ ",
" .++@+++++++. ",
" .++@@@@@@@@@. ",
" .+@@@@@@@@@. ",
" #.+@........ ",
" #.+.####### ",
" #..# ",
" #.# ",
" ## ",
" # ",
" "};

View File

@@ -1,32 +0,0 @@
/* XPM */
static char *cross_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c None",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
" ######## ",
" #### ",
"# ## #",
"## ##",
"### ###",
"### ###",
"## ##",
"# ## #",
" #### ",
" ###### "
};

View File

@@ -1,31 +0,0 @@
/* XPM */
static char * deffile_xpm[] = {
"16 16 12 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #FFFFFF",
"# c #282829",
"$ c #505052",
"% c #78787B",
"& c #A0A0A4",
"* c #404040",
"= c #1F1F1F",
"- c #3F3F3F",
"; c #2F2F2F",
" ",
" ....... ",
" .+@@@@@@# ",
" .+@@@@@@$% ",
" .+@@@@@@$&% ",
" .+@@@@@@#$$# ",
" .+@@@@@@@@@@. ",
" .+@@@@@@@@@@. ",
" .+@@@@@@@@@@. ",
" .+@@@@@@@@@@. ",
" .+@@@@@@@@@@. ",
" .+@@@@@@@@@@. ",
" .*++++++++++. ",
" .=---=;-----. ",
" ",
" "};

View File

@@ -1,23 +0,0 @@
/* XPM */
static char * delbookm_xpm[] = {
"16 15 5 1",
" c None",
". c #808080",
"+ c #000000",
"@ c #FFFFFF",
"# c #F4D4D6",
" .+++++. ",
".+@+++@+. ",
"+@@@+@@@+ + ",
"++@@@@@++ +#+ ",
"+++@@@++++###+ ",
"++@@@@@++#####+ ",
"+@@@+@@@+####+ ",
".+@+++@+.###+ ",
" .+++++.###+ ",
" +#####+ ",
" +#####+ ",
" ++++##+ ",
" +#+ ",
" ++ ",
" + "};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */
"20 20 16 1",
" c Gray0",
". c #800000",
"X c #008000",
"o c #808000",
"O c #000080",
"+ c #800080",
"@ c #008080",
"# c None",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"####################",
"####################",
"####################",
"#### ###########",
"### *:*:* ##########",
"## ####",
"## :*:*:*:*:*:*: ###",
"## *:*: :*:*:*:* ###",
"## :*: :*:*:*: ###",
"## *: :*:*:* ###",
"## :*:* *:*:*:*: ###",
"## *:*: :*:*:*:* ###",
"## :*:* :*: ###",
"## *:*:*:*:*:*:* ###",
"## :*:*:*:*:*:*: ###",
"## ###",
"####################",
"####################",
"####################",
"####################",
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char * down_xpm[] = {
"16 16 5 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #C0E4CB",
"# c #77C490",
" ",
" .....+ ",
" .@##.+ ",
" .@##.+ ",
" .@##.+ ",
" .@##.+ ",
" .@##.+ ",
" .@##.+++++ ",
" ....@##....+ ",
" .@@####@.+ ",
" .@@##@.+ ",
" .@@@.+ ",
" .@.+ ",
" . ",
" ",
" "};

View File

@@ -1,76 +0,0 @@
/* XPM */
static char * exefile_xpm[] = {
"16 16 57 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #650000",
"# c #CB0000",
"$ c #700000",
"% c #CDCDCD",
"& c #D2D2D2",
"* c #D7D7D7",
"= c #282829",
"- c #FF0000",
"; c #E60000",
"> c #FFFFFF",
", c #505052",
"' c #78787B",
") c #CC0000",
"! c #F70000",
"~ c #A0A0A4",
"{ c #8C4848",
"] c #FFA0A0",
"^ c #A95959",
"/ c #DBDBDB",
"( c #F7F7F7",
"_ c #0000C8",
": c #0000F4",
"< c #ECECEC",
"[ c #1010BC",
"} c #1313E8",
"| c #EDEDED",
"1 c #8B8B8B",
"2 c #AFAFAF",
"3 c #C4C4C4",
"4 c #FDFDFD",
"5 c #E8E8E8",
"6 c #FFFF00",
"7 c #007300",
"8 c #00B200",
"9 c #BFBFBF",
"0 c #CBCBCB",
"a c #DEDEDE",
"b c #00A800",
"c c #00FF00",
"d c #BEBEBE",
"e c #FCFCFC",
"f c #7D7D7D",
"g c #F8F8F8",
"h c #888888",
"i c #F8F800",
"j c #F7F700",
"k c #006200",
"l c #00A100",
"m c #757575",
"n c #959595",
"o c #404040",
"p c #1F1F1F",
"q c #3F3F3F",
"r c #2F2F2F",
" ",
" ........ ",
" .+@#$%&*= ",
" .+#-;>>>,' ",
" .+)-!>>>,~' ",
" .+{]^>>>=,,= ",
" .+/>(>>>>>_:. ",
" .+<>>>>>>>[}. ",
" .+|>>>>>>>12. ",
" .+|>>>>>>>34. ",
" .+/>56667894. ",
" .+0>a666bcde. ",
" .+fghiijklmn. ",
" .o++++++++++. ",
" .pqqqpprqqqq. ",
" "};

View File

@@ -1,26 +0,0 @@
/* XPM */
static char *fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c None",
". c Black",
"X c Yellow",
"o c Gray100",
"O c #bfbf00",
/* pixels */
" ",
" ... ",
" . . .",
" ..",
" ... ...",
" .XoX....... ",
" .oXoXoXoXo. ",
" .XoXoXoXoX. ",
" .oXoX..........",
" .XoX.OOOOOOOOO.",
" .oo.OOOOOOOOO. ",
" .X.OOOOOOOOO. ",
" ..OOOOOOOOO. ",
" ........... ",
" "
};

View File

@@ -1,28 +0,0 @@
/* XPM */
static char * folder_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 6 1",
/* colors */
" s None c None",
". c #000000",
"+ c #c0c0c0",
"@ c #808080",
"# c #ffff00",
"$ c #ffffff",
/* pixels */
" ",
" @@@@@ ",
" @#+#+#@ ",
" @#+#+#+#@@@@@@ ",
" @$$$$$$$$$$$$@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @@@@@@@@@@@@@@.",
" ..............",
" ",
" "};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char * forward_xpm[] = {
"16 16 5 1",
" c None",
". c #000000",
"+ c #C0E4CB",
"@ c #77C490",
"# c #808080",
" ",
" ",
" . ",
" .. ",
" .+. ",
" ........++. ",
" .+++++++@++. ",
" .@@@@@@@@@++. ",
" .@@@@@@@@@+. ",
" ........@+.# ",
" #######.+.# ",
" #..# ",
" #.# ",
" ## ",
" # ",
" "};

View File

@@ -1,522 +0,0 @@
/* XPM */
static char * error_xpm[] = {
"48 48 471 2",
" c None",
". c #FD3819",
"+ c #FD3319",
"@ c #FA3019",
"# c #F33119",
"$ c #EE301A",
"% c #EB311B",
"& c #E9301A",
"* c #E9321C",
"= c #EB331E",
"- c #FF3A1A",
"; c #FF3318",
"> c #ED2E17",
", c #D32914",
"' c #C32714",
") c #BA2614",
"! c #B52514",
"~ c #B22514",
"{ c #B12615",
"] c #B42717",
"^ c #BC2A18",
"/ c #C62C1A",
"( c #CD2E1C",
"_ c #CF2F1C",
": c #FF3216",
"< c #DD2A14",
"[ c #C32613",
"} c #B32311",
"| c #AE2312",
"1 c #AB2313",
"2 c #A82212",
"3 c #A52212",
"4 c #961F11",
"5 c #952011",
"6 c #A22314",
"7 c #A72516",
"8 c #A92718",
"9 c #AB2719",
"0 c #B32A1A",
"a c #BD2C1D",
"b c #B52A1C",
"c c #FD3518",
"d c #EB2D14",
"e c #C32512",
"f c #B12311",
"g c #AC2211",
"h c #A92211",
"i c #A82312",
"j c #A62212",
"k c #9F2112",
"l c #A32313",
"m c #A72415",
"n c #A62617",
"o c #A32518",
"p c #A62718",
"q c #A62719",
"r c #A8291B",
"s c #AD2A1B",
"t c #AB291C",
"u c #FE3317",
"v c #D82914",
"w c #B92311",
"x c #A92111",
"y c #A72212",
"z c #962011",
"A c #A02214",
"B c #A72517",
"C c #A62618",
"D c #A2271A",
"E c #A5281B",
"F c #A5291B",
"G c #A82A1D",
"H c #A5291D",
"I c #FF3417",
"J c #D02813",
"K c #B32310",
"L c #A92110",
"M c #A82211",
"N c #A82313",
"O c #A42313",
"P c #9B2013",
"Q c #A62517",
"R c #AB3326",
"S c #A5281A",
"T c #A2281C",
"U c #A42A1D",
"V c #98271C",
"W c #FD3517",
"X c #D52913",
"Y c #A82314",
"Z c #A72414",
"` c #A42415",
" . c #9D2214",
".. c #A02416",
"+. c #A52516",
"@. c #A52719",
"#. c #AA3427",
"$. c #AA3428",
"%. c #A4291C",
"&. c #9B281C",
"*. c #A1291D",
"=. c #A1291E",
"-. c #9E2A1E",
";. c #852319",
">. c #FC391A",
",. c #E22B15",
"'. c #B62412",
"). c #AC3021",
"!. c #AC3022",
"~. c #9C2316",
"{. c #992416",
"]. c #A22618",
"^. c #A5271A",
"/. c #AA3529",
"(. c #A93529",
"_. c #A9362A",
":. c #A42A1E",
"<. c #A42B1E",
"[. c #A02A1F",
"}. c #A02A20",
"|. c #99291E",
"1. c #671C16",
"2. c #FC3017",
"3. c #BE2512",
"4. c #AA2F20",
"5. c #A92F20",
"6. c #AC3123",
"7. c #A02518",
"8. c #962417",
"9. c #9C2518",
"0. c #A5291C",
"a. c #A9362B",
"b. c #A9372B",
"c. c #A32B1F",
"d. c #A32C20",
"e. c #A02B20",
"f. c #9E2A20",
"g. c #8C271D",
"h. c #FA3619",
"i. c #AE2212",
"j. c #A82414",
"k. c #941F12",
"l. c #9E2E20",
"m. c #AB3224",
"n. c #AB3225",
"o. c #A3271A",
"p. c #942417",
"q. c #962418",
"r. c #A1281C",
"s. c #A42B1F",
"t. c #A8372C",
"u. c #A8382D",
"v. c #A32C21",
"w. c #A02C20",
"x. c #A02C21",
"y. c #962920",
"z. c #5B1A13",
"A. c #FA3118",
"B. c #BB2513",
"C. c #A42212",
"D. c #981F11",
"E. c #9D2314",
"F. c #AA3326",
"G. c #A3281B",
"H. c #922519",
"I. c #902419",
"J. c #9D271B",
"K. c #A8382E",
"L. c #A8392E",
"M. c #A22D22",
"N. c #A02D22",
"O. c #9B2C21",
"P. c #7D231C",
"Q. c #DD2D17",
"R. c #AF2413",
"S. c #A62213",
"T. c #9C2112",
"U. c #AA3327",
"V. c #AF3F33",
"W. c #A2291C",
"X. c #99271B",
"Y. c #92251B",
"Z. c #9B281D",
"`. c #A22D21",
" + c #A7392F",
".+ c #A93F2F",
"++ c #A12F22",
"@+ c #A02E23",
"#+ c #88281F",
"$+ c #300E0B",
"%+ c #F6361B",
"&+ c #C72816",
"*+ c #A92413",
"=+ c #D48D1D",
"-+ c #E4AF21",
";+ c #E3AF22",
">+ c #E1AE24",
",+ c #E0AD25",
"'+ c #DFAE28",
")+ c #DEAD29",
"!+ c #DDA82A",
"~+ c #DDAC2A",
"{+ c #DEB139",
"]+ c #DFB445",
"^+ c #DDB03A",
"/+ c #DAAC2F",
"(+ c #D9A832",
"_+ c #D9AC32",
":+ c #D8A733",
"<+ c #D2A332",
"[+ c #C89B30",
"}+ c #D1A333",
"|+ c #D4A637",
"1+ c #D3A638",
"2+ c #C1782E",
"3+ c #A12D22",
"4+ c #9F2E24",
"5+ c #902B22",
"6+ c #41130F",
"7+ c #F7321B",
"8+ c #BD2716",
"9+ c #DCAD2D",
"0+ c #DBAC2E",
"a+ c #DAAE39",
"b+ c #DBAF3A",
"c+ c #DBAD3E",
"d+ c #D7A734",
"e+ c #D5A634",
"f+ c #D2A436",
"g+ c #D3A63A",
"h+ c #D2A539",
"i+ c #A12F25",
"j+ c #9F2F25",
"k+ c #952C23",
"l+ c #4D1712",
"m+ c #F1321B",
"n+ c #B52615",
"o+ c #E2B232",
"p+ c #DAA82F",
"q+ c #D5A82E",
"r+ c #D1A230",
"s+ c #D9AB3E",
"t+ c #DAAC3F",
"u+ c #D6A735",
"v+ c #D1A53C",
"w+ c #A13026",
"x+ c #9F2F26",
"y+ c #962E24",
"z+ c #571B15",
"A+ c #020303",
"B+ c #EE321B",
"C+ c #E0B234",
"D+ c #DFB135",
"E+ c #D3A332",
"F+ c #D0A131",
"G+ c #D5A533",
"H+ c #D8AC40",
"I+ c #C79D37",
"J+ c #C59C39",
"K+ c #C49C3A",
"L+ c #A13027",
"M+ c #9E3026",
"N+ c #942D25",
"O+ c #581B16",
"P+ c #010202",
"Q+ c #E4311B",
"R+ c #B12617",
"S+ c #DFAD36",
"T+ c #DFB036",
"U+ c #D3A433",
"V+ c #CC9F32",
"W+ c #D2A435",
"X+ c #D6AB42",
"Y+ c #D5AB43",
"Z+ c #D0A53D",
"`+ c #D0A53F",
" @ c #A03127",
".@ c #9E3027",
"+@ c #912D25",
"@@ c #4E1814",
"#@ c #000101",
"$@ c #DF301C",
"%@ c #B12718",
"&@ c #CC9D30",
"*@ c #D1A436",
"=@ c #CA9E34",
"-@ c #CFA337",
";@ c #D4AA44",
">@ c #D3AA47",
",@ c #CFA53E",
"'@ c #CFA540",
")@ c #A03128",
"!@ c #9E3128",
"~@ c #892B24",
"{@ c #3D130F",
"]@ c #D02E1B",
"^@ c #B62819",
"/@ c #CD8622",
"(@ c #DCB03B",
"_@ c #CB9D31",
":@ c #D1A437",
"<@ c #CBA037",
"[@ c #CFA338",
"}@ c #D2AA48",
"|@ c #C18138",
"1@ c #A03229",
"2@ c #9A3029",
"3@ c #7F2821",
"4@ c #240B0A",
"5@ c #B72819",
"6@ c #BA2B1A",
"7@ c #A32618",
"8@ c #9C271B",
"9@ c #9A261B",
"0@ c #A9372C",
"a@ c #9A2B1F",
"b@ c #992B20",
"c@ c #A22E23",
"d@ c #992C21",
"e@ c #992C22",
"f@ c #A02E24",
"g@ c #9C2D23",
"h@ c #A53D34",
"i@ c #9D3129",
"j@ c #953028",
"k@ c #6C221D",
"l@ c #0D0404",
"m@ c #C72E1D",
"n@ c #AB281A",
"o@ c #98271B",
"p@ c #95261B",
"q@ c #9F291E",
"r@ c #A6362B",
"s@ c #A32D21",
"t@ c #902A1F",
"u@ c #A22F24",
"v@ c #982D23",
"w@ c #A02F25",
"x@ c #9D2F26",
"y@ c #9F3026",
"z@ c #A53E35",
"A@ c #9F332A",
"B@ c #9D322A",
"C@ c #8B2C26",
"D@ c #4E1915",
"E@ c #010101",
"F@ c #AE281A",
"G@ c #AD291B",
"H@ c #A2271B",
"I@ c #99281C",
"J@ c #9E291F",
"K@ c #9A291E",
"L@ c #A2362C",
"M@ c #A22E24",
"N@ c #87281E",
"O@ c #8A291F",
"P@ c #982D24",
"Q@ c #9C2F26",
"R@ c #9F3128",
"S@ c #A23E36",
"T@ c #983129",
"U@ c #752620",
"V@ c #1D0908",
"W@ c #020202",
"X@ c #6B1B12",
"Y@ c #B42C1D",
"Z@ c #A8291C",
"`@ c #9A2A1E",
" # c #A22B20",
".# c #A3382E",
"+# c #A1372D",
"@# c #9C2C21",
"## c #9F2D23",
"$# c #A12F24",
"%# c #9A2C23",
"&# c #9D2F25",
"*# c #972D25",
"=# c #9D3027",
"-# c #9E3129",
";# c #9F332B",
"># c #9F3E36",
",# c #8F3832",
"'# c #4E1A16",
")# c #8A2216",
"!# c #AD2B1D",
"~# c #A4291D",
"{# c #A73A2F",
"]# c #A02D23",
"^# c #9D2E23",
"/# c #972E26",
"(# c #9F322A",
"_# c #9E3229",
":# c #9D332B",
"<# c #8F2F28",
"[# c #66221D",
"}# c #100605",
"|# c #A12A1F",
"1# c #A63B31",
"2# c #972F27",
"3# c #9C322A",
"4# c #94302A",
"5# c #722620",
"6# c #270D0B",
"7# c #3A0F0B",
"8# c #9C281C",
"9# c #9F3930",
"0# c #8F2A22",
"a# c #982E25",
"b# c #963028",
"c# c #963029",
"d# c #772822",
"e# c #361210",
"f# c #030303",
"g# c #330D09",
"h# c #8B251C",
"i# c #9B2A1F",
"j# c #A23B32",
"k# c #90362F",
"l# c #982E26",
"m# c #A0322A",
"n# c #9D332A",
"o# c #9A322A",
"p# c #8D2E28",
"q# c #6D241F",
"r# c #33100E",
"s# c #1D0907",
"t# c #6E1E16",
"u# c #96291F",
"v# c #9D2B21",
"w# c #9F2E23",
"x# c #9D3A32",
"y# c #943029",
"z# c #832C25",
"A# c #5C1F1B",
"B# c #1E0A08",
"C# c #000000",
"D# c #41130E",
"E# c #85251C",
"F# c #912920",
"G# c #972C22",
"H# c #9C2D24",
"I# c #9E3127",
"J# c #A23D35",
"K# c #9D3229",
"L# c #9A312A",
"M# c #933028",
"N# c #832B24",
"O# c #6B241E",
"P# c #401512",
"Q# c #070302",
"R# c #0C0403",
"S# c #37100D",
"T# c #681E17",
"U# c #81261E",
"V# c #8B2921",
"W# c #8F2B23",
"X# c #942E26",
"Y# c #902D26",
"Z# c #842A24",
"`# c #5C1E1A",
" $ c #36120F",
".$ c #0D0504",
"+$ c #170706",
"@$ c #2D0E0B",
"#$ c #401310",
"$$ c #4E1813",
"%$ c #581C17",
"&$ c #401411",
"*$ c #2B0E0C",
"=$ c #140706",
"-$ c #030202",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . + @ # $ % & * = ",
" - ; > , ' ) ! ~ ~ { ] ^ / ( _ ",
" : < [ } | 1 2 3 4 5 6 7 7 8 9 0 a b ",
" c d e f g h 2 i j k l m 7 7 n o p q r s t ",
" u v w g x h 2 y j z A m 7 B n C q q D E F G H ",
" I J K L x M 2 N N O P O 7 Q n C R R S E F T U U V ",
" W X f L h 2 2 N Y Z m ` ...+.C q @.#.$.F %.&.*.=.-.;. ",
" >.,.'.L h 2 i N Y ).!.7 7 +.~.{.].^.S E /.(._.:.<.[.}.|.1. ",
" 2.3.g h 2 i N 4.5.m 6.6.n C p 7.8.9.E 0.%.U a.b.c.d.e.f.g. ",
" h., i.M 2 N N j.k.l.6.B m.n.q q S o.p.q.r.U :.s.t.u.v.w.x.y.z. ",
" A.B.M 2 C.D.Z m E.7 Q m.n.R F.S E F G.H.I.J.s.c.d.K.L.M.N.O.P. ",
" Q.R.y N S.T.m 7 7 n C C R U.V.$.0.%.U W.X.Y.Z.d.v.`. +.+++@+#+$+ ",
" %+&+*+=+-+-+;+>+>+,+'+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+|+1+2+3+4+5+6+ ",
" 7+8+N -+;+;+>+>+,+'+'+)+~+~+9+0+a+b+c+_+:+d+d+e+f+|+1+g+h+i+j+k+l+ ",
" m+n+Z ;+;+>+o+,+'+)+)+~+9+9+0+p+q+r+s+t+d+u+u+|+1+1+g+v+v+w+x+y+z+A+ ",
" B+{ m ;+>+,+,+C+D+)+~+9+9+0+/+/+(+E+F+G+H+H+|+1+1+I+J+J+K+L+M+N+O+P+ ",
" Q+R+7 >+,+'+'+)+S+T+9+0+0+/+(+_+:+d+U+V+W+X+Y+Y+g+v+v+Z+`+ @.@+@@@#@ ",
" $@%@7 ,+'+'+)+~+~+{+^+0+/+(+_+&@d+d+u+*@=@-@g+;@>@Z+Z+,@'@)@!@~@{@#@ ",
" ]@^@n /@)+)+~+~+9+0+^+(@(+_+:+_@_@u+|+|+:@<@[@v+}@}@,@'@|@1@2@3@4@#@ ",
" 5@6@C 7@q S E F 8@9@U a.0@c.d.v.a@b@c@d@e@f@g@j+L+ @h@1@1@i@j@k@l@P+ ",
" m@n@@.S E F %.U o@p@q@r@d.v.s@M.t@t@u@v@i+w@x@y@)@1@z@A@B@C@D@E@A+ ",
" F@G@S H@0.%.U :.<.I@J@K@L@x.M.c@M@N@O@P@P@L+y@Q@R@1@A@S@T@U@V@W@ ",
" X@Y@Z@0.%.U :.<.c.d.`@ #.#+#@###$#%#&#w+*#)@)@=#-#A@;#>#,#'#E@A+ ",
" )#!#~#*.:.<.c.d.d.a@b@M.{#]#^#f@w+w+ @/#/#1@(#_#;#:#<#[#}#W@A+ ",
" 8@U =.|#c.d.v.s@M.d@d@M@1#i+w+L+ @)@1@2#(#;#;#3#4#5#6#E@A+ ",
" 7#8#[.[.e.v.s@M.c@c@u@i+1#9#0#a#)@1@1@b#c#;#:#4#d#e#E@W@f# ",
" g#h#i#e.x.x.c@M@$#i+w+P@j#k#l#1@m#A@;#n#o#p#q#r#E@W@A+ ",
" s#t#u#v#N.]#w#i+w+w+ @/#x#z@(#A@B@o#y#z#A#B#E@W@A+ ",
" C#D#E#F#G#H#j+j+M+.@I#!@J#K#L#M#N#O#P#Q#W@W@A+ ",
" C#R#S#T#U#V#W#N+X#X#Y#C@Z#U@`# $.$E@W@W@f# ",
" f#W@+$@$#$$$O+%$D@&$*$=$-$W@W@W@A+ ",
" f#f#W@W@W@W@W@W@W@W@W@W@W@A+f# ",
" f#f#E@E@A+#@f#f#f# ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,474 +0,0 @@
/* XPM */
static char * info_xpm[] = {
"48 48 423 2",
" c None",
". c #FEFEFE",
"+ c #FFFFFF",
"@ c #F1F1F1",
"# c #CACACA",
"$ c #CBCBCB",
"% c #EDEDED",
"& c #999999",
"* c #4B4B4B",
"= c #131313",
"- c #2E2E2E",
"; c #393732",
"> c #423F36",
", c #242119",
"' c #282828",
") c #626262",
"! c #C2C2C2",
"~ c #FAFAFA",
"{ c #2D2D2D",
"] c #736F61",
"^ c #E0CE8A",
"/ c #EFDD8F",
"( c #F4E298",
"_ c #F4E191",
": c #F3E093",
"< c #ECD78C",
"[ c #D8C78E",
"} c #B7AA7C",
"| c #9B8C5A",
"1 c #5F5C4F",
"2 c #B6B6B6",
"3 c #FEFEFD",
"4 c #A1A1A1",
"5 c #1E1E1E",
"6 c #C2BEAF",
"7 c #F1DC92",
"8 c #F5E190",
"9 c #F7E7A5",
"0 c #F8EAAE",
"a c #F9E9A7",
"b c #F8E795",
"c c #F8E796",
"d c #F5E49C",
"e c #EBDB99",
"f c #E2CD7F",
"g c #D7C480",
"h c #21201E",
"i c #838383",
"j c #F9F9F9",
"k c #DDD9CA",
"l c #EFD986",
"m c #EFDA8E",
"n c #F8EAAF",
"o c #F9F0C7",
"p c #FAF5DE",
"q c #FAF3D0",
"r c #FAEAA6",
"s c #F9E89E",
"t c #F8E793",
"u c #F7E493",
"v c #EFDD93",
"w c #E5D187",
"x c #DFD2A9",
"y c #595958",
"z c #939393",
"A c #474747",
"B c #BAB6A9",
"C c #F5E4A3",
"D c #F4DE87",
"E c #F4E7B2",
"F c #F9F5E3",
"G c #FAF6E6",
"H c #FBF8ED",
"I c #FBF9EF",
"J c #FAF8EC",
"K c #FAF3DA",
"L c #F9E99B",
"M c #F8E791",
"N c #F6E38F",
"O c #EFDD92",
"P c #DFCB80",
"Q c #D7C896",
"R c #333333",
"S c #C9C9C9",
"T c #B4B4B4",
"U c #545454",
"V c #F0DD9C",
"W c #F3DF8D",
"X c #F7E69F",
"Y c #F8EFCF",
"Z c #FAF5E5",
"` c #F9F4E2",
" . c #FBF6E7",
".. c #FAF5E7",
"+. c #FAF6E9",
"@. c #FAEDB7",
"#. c #F9E89B",
"$. c #F8E691",
"%. c #F5E391",
"&. c #E8D68B",
"*. c #D1BC70",
"=. c #A29C84",
"-. c #525252",
";. c #848484",
">. c #989585",
",. c #EED681",
"'. c #F5E293",
"). c #F8E8A9",
"!. c #FAF4E1",
"~. c #FAF6E7",
"{. c #F9F5E4",
"]. c #F9F5E6",
"^. c #F7EEC3",
"/. c #F7E7A0",
"(. c #F7E691",
"_. c #F7E58F",
":. c #F1E08E",
"<. c #DBC878",
"[. c #C6B677",
"}. c #2A2A27",
"|. c #DADADA",
"1. c #646464",
"2. c #C1B999",
"3. c #EFD882",
"4. c #F6E499",
"5. c #F8EDBA",
"6. c #FAF5E4",
"7. c #FBF5E6",
"8. c #FAF5E6",
"9. c #F9F1DB",
"0. c #F9F4E3",
"a. c #F8F2DB",
"b. c #F6EBBE",
"c. c #F6E6A0",
"d. c #F3E290",
"e. c #E4D07E",
"f. c #C1AE67",
"g. c #646159",
"h. c #A0A0A0",
"i. c #EFD881",
"j. c #F6E498",
"k. c #FAF6E8",
"l. c #F9F5E5",
"m. c #F8F2DE",
"n. c #F7EFD0",
"o. c #F5E9C2",
"p. c #F4E5A0",
"q. c #F7E695",
"r. c #F3E295",
"s. c #E6D27E",
"t. c #C6B36A",
"u. c #79766C",
"v. c #7B7B7B",
"w. c #636363",
"x. c #B8B095",
"y. c #FBF8EE",
"z. c #FAF7EB",
"A. c #F9F6E5",
"B. c #F9F6EA",
"C. c #F9F4E0",
"D. c #F4EAC9",
"E. c #F7EBB1",
"F. c #F5E7A2",
"G. c #F6E697",
"H. c #F6E59B",
"I. c #F2E093",
"J. c #E7D480",
"K. c #CCB96E",
"L. c #797157",
"M. c #949494",
"N. c #818181",
"O. c #898782",
"P. c #F0DC91",
"Q. c #F6E496",
"R. c #F7EAAF",
"S. c #FBF7EC",
"T. c #F9F6E7",
"U. c #FAF5E8",
"V. c #FBF7ED",
"W. c #FAEEBB",
"X. c #F8ECB8",
"Y. c #F4EACA",
"Z. c #F3E6A3",
"`. c #F6E593",
" + c #F6E493",
".+ c #F2E090",
"++ c #E4D17E",
"@+ c #C4B269",
"#+ c #6D664D",
"$+ c #A5A5A5",
"%+ c #BFBFBF",
"&+ c #464646",
"*+ c #EDD990",
"=+ c #F2DC8A",
"-+ c #F7E8A6",
";+ c #FAF4D9",
">+ c #F8F1DB",
",+ c #F9F4E7",
"'+ c #F9EFCB",
")+ c #FAECAF",
"!+ c #F5E7B2",
"~+ c #EDE7BA",
"{+ c #F2E29A",
"]+ c #F6E591",
"^+ c #F5E393",
"/+ c #EFDC8B",
"(+ c #D9C677",
"_+ c #AB9B5B",
":+ c #201D13",
"<+ c #D5D5D5",
"[+ c #FCFCFC",
"}+ c #FDFDFC",
"|+ c #6F6F6F",
"1+ c #9B9584",
"2+ c #F1DC86",
"3+ c #F6E59D",
"4+ c #FAF2D3",
"5+ c #FBF7EA",
"6+ c #F9F4E5",
"7+ c #FAF3E5",
"8+ c #F8ECB9",
"9+ c #F6E7A7",
"0+ c #F3E7AD",
"a+ c #F1E3A4",
"b+ c #F4E395",
"c+ c #EADA91",
"d+ c #E4D07F",
"e+ c #CDBC70",
"f+ c #817959",
"g+ c #4E4E4E",
"h+ c #DEDEDD",
"i+ c #3E3E3E",
"j+ c #EEDA8D",
"k+ c #F7E8A7",
"l+ c #FAF2D2",
"m+ c #FAF7EA",
"n+ c #F9F4E6",
"o+ c #F7EED9",
"p+ c #F1E6AD",
"q+ c #F4E49D",
"r+ c #F2E4A1",
"s+ c #F1E19B",
"t+ c #F0DF92",
"u+ c #E5D48D",
"v+ c #DBC97E",
"w+ c #D9C577",
"x+ c #B9A964",
"y+ c #4F4938",
"z+ c #A7A7A7",
"A+ c #FDFDFD",
"B+ c #262626",
"C+ c #F2E097",
"D+ c #F9EBB1",
"E+ c #FAF3DB",
"F+ c #F8F1DC",
"G+ c #F7EFD8",
"H+ c #F4E9C4",
"I+ c #F3E4A1",
"J+ c #F3E296",
"K+ c #F1E195",
"L+ c #E9DA96",
"M+ c #E6D68C",
"N+ c #DAC87E",
"O+ c #DAC777",
"P+ c #C4B36B",
"Q+ c #958857",
"R+ c #353535",
"S+ c #F4F4F4",
"T+ c #E4E4E4",
"U+ c #434032",
"V+ c #F3DE87",
"W+ c #F8EBB1",
"X+ c #F9F2DB",
"Y+ c #F3EAC1",
"Z+ c #F4E9C1",
"`+ c #F3E6AD",
" @ c #EEDB8B",
".@ c #DCCB84",
"+@ c #D1C076",
"@@ c #D1BF73",
"#@ c #C9B76D",
"$@ c #9D9164",
"%@ c #43433D",
"&@ c #C2C2C1",
"*@ c #4D493C",
"=@ c #EFD782",
"-@ c #F4E9BB",
";@ c #F4E7BB",
">@ c #F1DFA1",
",@ c #F3E3A7",
"'@ c #E3D186",
")@ c #D9C679",
"!@ c #CAB871",
"~@ c #C1B372",
"{@ c #AEA475",
"]@ c #7F7A64",
"^@ c #0B0B0B",
"/@ c #7D7D7D",
"(@ c #6D6D64",
"_@ c #121211",
":@ c #383526",
"<@ c #5F5E59",
"[@ c #5A594C",
"}@ c #A9A077",
"|@ c #E8D48D",
"1@ c #E7D180",
"2@ c #DBC77C",
"3@ c #DBC97C",
"4@ c #BAA864",
"5@ c #8F8255",
"6@ c #3B3724",
"7@ c #0F0E0C",
"8@ c #494949",
"9@ c #BBBBBB",
"0@ c #35352E",
"a@ c #9D9D99",
"b@ c #B4B4B2",
"c@ c #EFEFEE",
"d@ c #DADAD8",
"e@ c #696964",
"f@ c #1D1D16",
"g@ c #928963",
"h@ c #C2B071",
"i@ c #B3A05E",
"j@ c #A99959",
"k@ c #474439",
"l@ c #DCDCDC",
"m@ c #F5F5F5",
"n@ c #050504",
"o@ c #161614",
"p@ c #55554E",
"q@ c #8D8D85",
"r@ c #D4D4D1",
"s@ c #F6F6F6",
"t@ c #CACAC4",
"u@ c #585851",
"v@ c #4D4C47",
"w@ c #80795F",
"x@ c #716D5B",
"y@ c #2A2A2A",
"z@ c #D9D9D9",
"A@ c #585858",
"B@ c #23231F",
"C@ c #C7C7C5",
"D@ c #A9A9A4",
"E@ c #3D3D35",
"F@ c #131311",
"G@ c #8D8D87",
"H@ c #C3C3C1",
"I@ c #7B7B7A",
"J@ c #5C5C5B",
"K@ c #0D0D0A",
"L@ c #3B3B3B",
"M@ c #BABABA",
"N@ c #191919",
"O@ c #525248",
"P@ c #D7D7D3",
"Q@ c #F7F7F7",
"R@ c #CFCFC8",
"S@ c #2F2F29",
"T@ c #474742",
"U@ c #71716F",
"V@ c #757571",
"W@ c #0F0F0F",
"X@ c #ECECEC",
"Y@ c #000000",
"Z@ c #080807",
"`@ c #96968E",
" # c #DFDFDE",
".# c #FBFBFB",
"+# c #B3B3B1",
"@# c #70706B",
"## c #4F4F4E",
"$# c #42423A",
"%# c #434343",
"&# c #BCBCB9",
"*# c #AEAEA9",
"=# c #4B4B44",
"-# c #0F0F0E",
";# c #92928D",
"># c #929292",
",# c #696968",
"'# c #141412",
")# c #878787",
"!# c #75756C",
"~# c #C3C3C2",
"{# c #F0F0F0",
"]# c #B9B9B1",
"^# c #525249",
"/# c #464644",
"(# c #7F7F7B",
"_# c #6D6D6D",
":# c #050505",
"<# c #44443B",
"[# c #333331",
"}# c #B3B3B0",
"|# c #EFEFEF",
"1# c #CFCFCE",
"2# c #434342",
"3# c #56564F",
"4# c #272727",
"5# c #161613",
"6# c #12120F",
"7# c #2C2C2A",
"8# c #9E9E9A",
"9# c #6B6B6A",
"0# c #10100E",
"a# c #21211D",
"b# c #20201C",
"c# c #383837",
"d# c #737373",
"e# c #141411",
"f# c #090908",
"g# c #0B0B09",
"h# c #31312B",
"i# c #33332F",
"j# c #30302F",
"k# c #101010",
"l# c #4E4E45",
"m# c #010101",
"n# c #1A1A17",
"o# c #0C0C0B",
"p# c #020202",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . . + + . . . ",
" . . . . . . . . . . . . ",
" + . . . . . . . . . . . . . . . ",
" . . . . . . @ # $ $ % . . . . . . . ",
" . . . . % & * = - ; > , ' ) ! ~ . . . . ",
" . . . . ! { ] ^ / ( _ : < [ } | 1 2 . . . . ",
" 3 . . . 4 5 6 7 8 9 0 a b c d e f g h i j . . + ",
" . . . ! 5 k l m n o p q r s t u v w x y z . . . . ",
" . . ~ A B C D E F G H I J K L M N O P Q R S . . . ",
" . . . T U V W X Y Z ` ...+.G @.#.$.%.&.*.=.-.. . . ",
" . . . ;.>.,.'.).!.~.` {.` ]...^./.(._.:.<.[.}.|.. . . ",
" . . . 1.2.3.4.5.6.Z 7.8.9.0.a.b.c.$.$.d.e.f.g.h.. . . ",
" . . . 1.2.i.j.5.{.k.k.l.` m.n.o.p.q.q.r.s.t.u.v.. . + ",
" . . . w.x.i.'.5...y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.. + + ",
" . . . N.O.P.Q.R.Z S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+. . + ",
" . . %+&+*+=+-+;+y.>+,+'+)+!+~+{+]+^+/+(+_+:+<+. . . ",
" [+}+j |+1+2+3+4+5+6+7+8+9+0+a+b+%.c+d+e+f+g+j . . ",
" [+}+}+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+. . . ",
" }+}+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+. . . ",
" [+}+T+U+V+W+X+Y+Z+`+s+/ @.@+@@@#@$@%@4 . . . ",
" [+&@*@=@-@;@>@,@C+/ '@)@!@~@{@]@^@/@~ . . . ",
" (@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@. . + + ",
" 0@a@b@c@d@e@f@g@h@i@j@k@) l@m@. . . + ",
" n@o@p@q@r@s@t@u@v@w@x@y@z@}+}+. . . ",
" A@B@C@D@E@F@G@H@I@J@K@L@M@}+}+}+. ",
" N@O@P@A+Q@R@S@T@U@V@W@X@[+[+[+ ",
" Y@Z@S@`@ #.#+#@###$#%# ",
" N@Y@&#*#=#-#;#>#|+,#'#)# ",
" Y@!#~#{#{#]#^#/#(#_#:# ",
" Y@Y@<#[#}#|#1#,#2#3#4# ",
" Y@5#6#S@7#8#|+9#Y@ ",
" Y@Y@0#a#b#c#,#d#Y@ ",
" e#f#5#F@g#h#i#j#k# ",
" l#m#e#n#o#0#Y@ ",
" m#p# ",
" ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,125 +0,0 @@
/* XPM */
static char * question_xpm[] = {
"48 48 74 1",
" c None",
". c #000000",
"+ c #A27F3B",
"@ c #B89243",
"# c #D8AB4E",
"$ c #9D7D3A",
"% c #A6823C",
"& c #7C622D",
"* c #F7D899",
"= c #F7E2B8",
"- c #D8BA7B",
"; c #BE9B53",
"> c #F7C35A",
", c #F7DFAF",
"' c #F7E5C0",
") c #F7D48C",
"! c #F7CF7E",
"~ c #D8B15F",
"{ c #6E5526",
"] c #F7DCA5",
"^ c #A8843D",
"/ c #937435",
"( c #AA863E",
"_ c #D8B66E",
": c #BEA363",
"< c #947536",
"[ c #927335",
"} c #F7C96D",
"| c #80632D",
"1 c #C39F57",
"2 c #A38E55",
"3 c #A48B5A",
"4 c #D2A64D",
"5 c #82662F",
"6 c #654F24",
"7 c #DCB463",
"8 c #BE9544",
"9 c #C3A466",
"0 c #8C6D31",
"a c #D2B06C",
"b c #D8BE86",
"c c #715929",
"d c #B99344",
"e c #B38D40",
"f c #D8B56E",
"g c #D8AC58",
"h c #997A3B",
"i c #000001",
"j c #6B5527",
"k c #C39F55",
"l c #DCC494",
"m c #DAB872",
"n c #C9AC73",
"o c #BFA16A",
"p c #19150D",
"q c #876A31",
"r c #C9A45B",
"s c #C6A76A",
"t c #7F6941",
"u c #977737",
"v c #D8B165",
"w c #D8AC5B",
"x c #BEA272",
"y c #C09745",
"z c #D8B163",
"A c #927C52",
"B c #735F3B",
"C c #A68748",
"D c #1A1A1A",
"E c #393939",
"F c #221C12",
"G c #DDBC74",
"H c #D2A64C",
"I c #705627",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ........ ",
" ...+@#$%&... ",
" ..#**=*---;%... ",
" ..>,'*)>>>!-~%{.. ",
" .>,]>^//(>>!_~%.. ",
" .:*=><....[>>}~~|.. ",
" .}'!<.. .1>!#~%.. ",
" .2),#.. .3>}~#%.. ",
" .4!>%.. .3}}_#5.. ",
" .>!>%.. .3>__#6.. ",
" .7~85.. .9}-#%... ",
" ....... 0ab~#c.. ",
" ..... .d)b#8... ",
" .e}b##... ",
" ..>)fgh..i ",
" jklmnop.. ",
" .qafrst.. ",
" .u-vwx.. ",
" .y-zwA.. ",
" .#b~#B.. ",
" .;-#8.. ",
" .CC%|.. ",
" .DE... ",
" .... ",
" ",
" F.... ",
" .G!)8.. ",
" .!**#.. ",
" .))~8.. ",
" .)_#8.. ",
" .H~8I.. ",
" ...... ",
" .... ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,291 +0,0 @@
/* XPM */
static char * warning_xpm[] = {
"48 48 240 2",
" c None",
". c #F42A14",
"+ c #C62210",
"@ c #F62B14",
"# c #D22411",
"$ c #A91D0F",
"% c #85170C",
"& c #F62913",
"* c #D52511",
"= c #A71D0E",
"- c #A11C0E",
"; c #9B1B0E",
"> c #641209",
", c #F72913",
"' c #E02712",
") c #B31F0F",
"! c #A41C0E",
"~ c #8A180C",
"{ c #EC2913",
"] c #B9200F",
"^ c #B14010",
"/ c #9A1C0F",
"( c #631109",
"_ c #F52A13",
": c #CA2310",
"< c #BB5B11",
"[ c #C26F12",
"} c #A31D0F",
"| c #A01D0F",
"1 c #921A0E",
"2 c #F52913",
"3 c #DB2612",
"4 c #A61D0F",
"5 c #E0AD11",
"6 c #DFB112",
"7 c #77150C",
"8 c #B72010",
"9 c #A31C0E",
"0 c #E1AE12",
"a c #D28814",
"b c #9F1D10",
"c c #911A0F",
"d c #4D0D07",
"e c #C56B12",
"f c #A11D10",
"g c #A21D10",
"h c #73150C",
"i c #DE2612",
"j c #DCAE11",
"k c #B9930E",
"l c #DEAC13",
"m c #CF8812",
"n c #901A0F",
"o c #490D07",
"p c #EF2914",
"q c #BA2010",
"r c #D18912",
"s c #C39B0F",
"t c #010100",
"u c #0E0B00",
"v c #403105",
"w c #A11D11",
"x c #9E1D11",
"y c #F32912",
"z c #D12412",
"A c #7A6109",
"B c #070400",
"C c #130F00",
"D c #020200",
"E c #CD8713",
"F c #490E09",
"G c #E82814",
"H c #B21F10",
"I c #E0B213",
"J c #2C2303",
"K c #030100",
"L c #010000",
"M c #191300",
"N c #DCAB15",
"O c #9D1E12",
"P c #72150D",
"Q c #C82312",
"R c #251D02",
"S c #000000",
"T c #040300",
"U c #292003",
"V c #A01E12",
"W c #8F1B10",
"X c #DC2613",
"Y c #271E02",
"Z c #1D1602",
"` c #423305",
" . c #71150D",
".. c #ED2914",
"+. c #BD2111",
"@. c #D08C13",
"#. c #4E3D06",
"$. c #403104",
"%. c #453506",
"&. c #DBAA16",
"*. c #CC8614",
"=. c #891A11",
"-. c #470E09",
";. c #F42914",
">. c #D92613",
",. c #1E1702",
"'. c #251D03",
"). c #413206",
"!. c #9F1E13",
"~. c #991D13",
"{. c #5E110A",
"]. c #EA2915",
"^. c #A21D0F",
"/. c #090700",
"(. c #0B0900",
"_. c #CC8615",
":. c #9C1E13",
"<. c #861910",
"[. c #2C0805",
"}. c #D42513",
"|. c #050400",
"1. c #100D01",
"2. c #0A0800",
"3. c #332704",
"4. c #DAAA17",
"5. c #981D14",
"6. c #5E120C",
"7. c #130F01",
"8. c #524007",
"9. c #9E1E14",
"0. c #9B1E14",
"a. c #7A1710",
"b. c #382C05",
"c. c #513F07",
"d. c #151001",
"e. c #71570A",
"f. c #D8A919",
"g. c #8D1B12",
"h. c #490E0A",
"i. c #BD9312",
"j. c #675009",
"k. c #312604",
"l. c #C79A14",
"m. c #CB8617",
"n. c #9A1F15",
"o. c #6D160E",
"p. c #9D1F15",
"q. c #871B12",
"r. c #440E09",
"s. c #B62111",
"t. c #CB9E13",
"u. c #241C03",
"v. c #C49813",
"w. c #D7A81A",
"x. c #C16916",
"y. c #971E15",
"z. c #5C120D",
"A. c #D22614",
"B. c #CF8C12",
"C. c #4B3A07",
"D. c #020100",
"E. c #69520A",
"F. c #C98517",
"G. c #991F16",
"H. c #7B1912",
"I. c #2B0A07",
"J. c #EC2A16",
"K. c #3C2E05",
"L. c #090701",
"M. c #745A0C",
"N. c #9C1F16",
"O. c #8C1C14",
"P. c #460E0A",
"Q. c #D82715",
"R. c #C87E14",
"S. c #E0AE14",
"T. c #DFAD13",
"U. c #312605",
"V. c #7C610C",
"W. c #D7A816",
"X. c #BF6F16",
"Y. c #61130E",
"Z. c #EA2A16",
"`. c #BF2212",
" + c #B95B13",
".+ c #C16F14",
"++ c #C77E14",
"@+ c #CB8914",
"#+ c #DAAA16",
"$+ c #DBAB17",
"%+ c #D9AA19",
"&+ c #D8A91A",
"*+ c #D8A51C",
"=+ c #C57E16",
"-+ c #AB4216",
";+ c #781812",
">+ c #260806",
",+ c #CD2513",
"'+ c #9B1F17",
")+ c #8B1C15",
"!+ c #440E0A",
"~+ c #78150B",
"{+ c #520E07",
"]+ c #6A130B",
"^+ c #6F140B",
"/+ c #78150C",
"(+ c #86180D",
"_+ c #8A190F",
":+ c #931B10",
"<+ c #981F17",
"[+ c #5A120D",
"}+ c #020202",
"|+ c #0E0302",
"1+ c #230704",
"2+ c #2E0906",
"3+ c #410C07",
"4+ c #420C07",
"5+ c #571109",
"6+ c #5D110B",
"7+ c #60120B",
"8+ c #6E150C",
"9+ c #73160E",
"0+ c #801810",
"a+ c #881A11",
"b+ c #861B13",
"c+ c #851B14",
"d+ c #801A13",
"e+ c #731711",
"f+ c #4D100C",
"g+ c #0D0403",
"h+ c #220705",
"i+ c #210705",
"j+ c #230705",
"k+ c #420D08",
"l+ c #3E0C08",
"m+ c #3D0C09",
"n+ c #3C0C09",
"o+ c #3B0C09",
"p+ c #2E0A08",
"q+ c #1C0705",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . + ",
" @ # $ % ",
" & * = - ; > ",
" , ' ) ! ! - ~ ",
" { ] ! ! ^ ! / ( ",
" _ : ! ! < [ } | 1 ",
" 2 3 4 ! ! 5 6 } } | 7 ",
" { 8 ! 9 0 6 6 a } b c d ",
" _ : ! ! e 6 6 6 6 f g b h ",
" i 4 ! ! 5 j k j l m g b n o ",
" p q ! ! r s t u v l l g w x h ",
" y z ! ! ! 6 A B C D l l E w x n F ",
" G H ! ! I 6 J K L M l l N w w O P ",
" _ Q ! ! a 6 6 R S T U l N N E V O W F ",
" X 4 ! } 6 6 6 Y S Z ` N N N N V V O . ",
" ..+.! ! @.6 6 l #.S $.%.N N N &.*.V O =.-. ",
" ;.>.4 ! } 6 6 6 l ,.t '.).N N &.&.&.V !.~.{. ",
" ].8 ! ^.I 6 6 l l /.t (.'.N &.&.&.&._.!.:.<.[. ",
" p }.! } a 6 6 l l l |.1.2.3.&.&.&.&.4.4.!.!.5.6. ",
" ].8 } } 6 6 l l l l |.7.T 8.&.&.&.4.4.4._.9.0.a. ",
" p }.} } @.6 l l l l N b.c.d.e.&.&.4.4.4.4.f.9.9.g.h. ",
" ].8 } } 6 l l l l N N i.j.k.l.&.&.4.4.4.f.f.m.9.n.o. ",
" p }.} } @.6 l l l N N N N &.&.&.&.4.4.4.4.f.f.f.p.n.q.r. ",
" ].s.} } 6 l l l N N N N t.'.u.v.4.4.4.4.f.f.f.w.x.p.y.z. ",
" p A.} } B.l l l l N N N &.C.D.D.E.4.4.4.f.f.f.f.w.F.p.G.H.I. ",
" J.s.} } l l l l N N N N &.K.T L.M.4.4.f.f.f.f.w.w.w.p.N.O.P. ",
" Q.} } R.S.T.l N N N N &.&.i.U.V.W.4.f.f.f.f.w.w.w.w.X.N.G.Y. ",
" Z.`.} g g g g w w w +.+++@+#+$+$+$+%+%+%+%+&+&+&+&+*+=+-+G.;+>+ ",
" ,+} | g g g w w w w V V V V !.!.!.!.9.9.9.p.p.p.p.N.N.N.N.'+)+!+ ",
" ~+{+]+^+/+(+_+:+x O V V V !.!.!.!.9.9.9.p.p.p.p.N.N.N.N.'+'+<+[+ ",
" }+}+|+1+2+3+4+5+6+7+8+9+9+9+0+a+a+a+a+q.q.q.b+b+b+b+c+c+d+e+f+}+ ",
" }+}+}+}+}+}+}+}+}+g+h+i+i+j+k+l+l+l+l+l+l+m+m+m+n+n+n+o+p+q+}+ ",
" }+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+S ",
" }+}+}+}+}+}+}+}+}+}+}+}+}+}+ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *helpicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 6 1",
" c Gray0",
". c Blue",
"X c #808080808080",
"o c #c0c0c0c0c0c0",
"O c Gray100",
"+ c None",
/* pixels */
"+++++++++++XXXXXXXX+++++++++++++",
"++++++++XXXoOOOOOOoXXX++++++++++",
"++++++XXoOOOOOOOOOOOOoXX++++++++",
"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
"+++XOOOOOOOo......oOOOOOOO +++++",
"++XOOOOOOOo.oOO....oOOOOOOO ++++",
"+XoOOOOOOO..OOOO....OOOOOOOo +++",
"+XOOOOOOOO....OO....OOOOOOOO X++",
"XoOOOOOOOO....Oo....OOOOOOOOo X+",
"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
"++++++ oOOOOOOOOOOOOo XXXX++++",
"+++++++X oOOOOOOo XXXXX+++++",
"++++++++XXX oOOO XXXXXXX++++++",
"++++++++++XXXX OOO XXXXX++++++++",
"+++++++++++++X OOO XX+++++++++++",
"+++++++++++++++ OO XX+++++++++++",
"++++++++++++++++ O XX+++++++++++",
"+++++++++++++++++ XX+++++++++++",
"++++++++++++++++++XXX+++++++++++",
"+++++++++++++++++++XX+++++++++++"
};

View File

@@ -1,26 +0,0 @@
/* XPM */
static char * home_xpm[] = {
"20 20 3 1",
" c None",
". c #000000000000",
"X c #FFFFFFFFFFFF",
" ",
" ",
" .. ",
" . .... ",
" . .XX . ",
" . .XXXX . ",
" ..XXXXXX . ",
" .XXXXXXXX . ",
" .XXXXXXXXX . ",
" ...XXXXXXXX ... ",
" .XXXXXXXX . ",
" .XXX...XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" ..... ...... ",
" ",
" ",
" "};

View File

@@ -1,40 +0,0 @@
/* XPM */
static char * htmbook_xpm[] = {
"16 16 21 1",
" c None",
". c #007F7F",
"+ c #660000",
"@ c #CC0000",
"# c #E50000",
"$ c #FF0000",
"% c #F20000",
"& c #D80000",
"* c #720000",
"= c #7F0000",
"- c #BFBFBF",
"; c #E57F7F",
"> c #7F7F7F",
", c #FFFFFF",
"' c #F2BFBF",
") c #723F3F",
"! c #A5A5A5",
"~ c #E5E5E5",
"{ c #B2B2B2",
"] c #003F3F",
"^ c #000000",
" ",
" ......... ",
" +@#$$$$$%&+ ",
" +##$$$$$$$* ",
" +##$$$$$$$=- ",
" +##$$$$$$$=;> ",
" +##$$$$$$$=;,. ",
" +##$$$$$$$=;,. ",
" +##$$$$$$$=''. ",
" +##$$$$$$$=,;. ",
" +##$$$$$$%+,;. ",
" +&++++++++),;. ",
" ++!~~~~~~~~~,. ",
" ++!~~~~~~~~~{. ",
" ]^^^^^^^^^^^ ",
" "};

View File

@@ -1,28 +0,0 @@
/* XPM */
static char * htmfoldr_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 6 1",
/* colors */
" s None c None",
". c #000000",
"+ c #c0c0c0",
"@ c #808080",
"# c #ffff00",
"$ c #ffffff",
/* pixels */
" ",
" @@@@@ ",
" @#+#+#@ ",
" @#+#+#+#@@@@@@ ",
" @$$$$$$$$$$$$@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @@@@@@@@@@@@@@.",
" ..............",
" ",
" "};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * htmoptns_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" .. ",
" ... ",
" .... ",
" . ... ",
" .. ... ",
" . .. ",
" .. ... ",
" . .. ",
" ......... ",
" .. ... ",
" . ... ",
" .. ... ",
" .... ....... ",
" ",
" "};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmpage_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
" s None c None",
". c #000000",
"+ c #ffffff",
/* pixels */
" ",
" ........ ",
" .++++++.. ",
" .+.+.++.+. ",
" .++++++.... ",
" .+.+.+++++. ",
" .+++++++++. ",
" .+.+.+.+.+. ",
" .+++++++++. ",
" .+.+.+.+.+. ",
" .+++++++++. ",
" .+.+.+.+.+. ",
" .+++++++++. ",
" ........... ",
" ",
" "};

View File

@@ -1,35 +0,0 @@
/* XPM */
static char * htmsidep_xpm[] = {
"16 15 17 1",
" c None",
". c #000000",
"+ c #800000",
"@ c #008000",
"# c #808000",
"$ c #000080",
"% c #800080",
"& c #008080",
"* c #C0C0C0",
"= c #808080",
"- c #FF0000",
"; c #00FF00",
"> c #FFFF00",
", c #0000FF",
"' c #FF00FF",
") c #00FFFF",
"! c #FFFFFF",
"****************",
"*..............*",
"*.************.*",
"*..............*",
"*.****.!!!!!!!.*",
"*.****.!====*!.*",
"*.****.!!!!!!!.*",
"*.****.!===*!!.*",
"*.****.!!!!!!!.*",
"*.****.!====*!.*",
"*.****.!!!!!!!.*",
"*.****.!===*!!.*",
"*.****.!!!!!!!.*",
"*..............*",
"****************"};

View File

@@ -1,28 +0,0 @@
/* XPM */
static char * listview_xpm[] = {
"20 20 5 1",
" c None",
". c #000000",
"+ c #FFFFFF",
"@ c #000083",
"# c #838183",
" ",
" ",
" ................ ",
" .++++++++++++++. ",
" .+@@+++++@@++++. ",
" .+@+@+.#+@+@+.+. ",
" .+@@@++++@@@+++. ",
" .++++++++++++++. ",
" .++++++++++++++. ",
" .+@@+++++@@++++. ",
" .+@+@+.#+@+@+.+. ",
" .+@@@++++@@@+++. ",
" .++++++++++++++. ",
" .++++++++++++++. ",
" .+@@+++++@@++++. ",
" .+@+@+.#+@+@+.+. ",
" .+@@@++++@@@+++. ",
" ................ ",
" ",
" "};

View File

@@ -1,41 +0,0 @@
/* XPM */
static char * missimg_xpm[] = {
"29 31 7 1",
" c None",
". c #808080",
"+ c #FFFFFF",
"@ c #C0C0C0",
"# c #000000",
"$ c #333366",
"% c #B2B2B2",
"..................... ",
".+++++++++++++++++++.. ",
".+++++++++++++++++++.@. ",
".++@@@@@@@@@@@@@@@@@.+@. ",
".++@@@@@@@@@@@@@@@@@.++@. ",
".++@@@@@.@@@@.@@@@@@.+++@. ",
".++@@@@@@@@@@@@@@@@@.++++@. ",
".++@@@@@@@@@@@@@@@@@.+++++@. ",
".++@@.@@@@@@@@@@.@@@######## ",
".++@@@@@@@@@@@@@@@@@@$$$$$$#.",
".######@@@@@@@@@@@@@@@.....#.",
" ###@@@@@@@@@@@@@@@++#.",
" #####@@@@@@@@@@++#.",
" #@.@@@@@@@@++#.",
".. ###@@@@@@@++#.",
".+.... #@@@@@@++#.",
".++@@@... ####@@++#.",
".++@@@@@@.. #####.",
".++@@@@@@@@... ",
".++@@@@@@%%%%@. ",
".++@@@@@@%%%%@@.... ",
".++@@@@@@%%%%@@@@@@.... ",
".++@@@@@@%%%%@@@@@@@@@@.... ",
".++@@@@@@@@@@@@@@@@@@@@@@++#.",
".++@@@@@@@@@@@@@@@@@@@@@@++#.",
".++@@@@@@@@@@@@@@@@@@@@@@++#.",
".++@@@@@@@@@@@@@@@@@@@@@@++#.",
".++@@@@@@@@@@@@@@@@@@@@@@++#.",
".++++++++++++++++++++++++++#.",
".++++++++++++++++++++++++++#.",
"############################."};

View File

@@ -1,129 +0,0 @@
/* XPM */
static char * error_xpm[] = {
"48 48 78 1",
" c None",
". c #000000",
"+ c #200000",
"@ c #4A0000",
"# c #6B0000",
"$ c #8F0000",
"% c #890000",
"& c #5F0000",
"* c #380000",
"= c #0E0000",
"- c #030000",
"; c #480000",
"> c #9C0000",
", c #E40000",
"' c #FE0000",
") c #FF0000",
"! c #C90000",
"~ c #7E0000",
"{ c #250000",
"] c #090000",
"^ c #700000",
"/ c #DE0000",
"( c #FB0000",
"_ c #BB0000",
": c #410000",
"< c #500000",
"[ c #DF0000",
"} c #B00000",
"| c #0D0000",
"1 c #AB0000",
"2 c #F60000",
"3 c #600000",
"4 c #010000",
"5 c #220000",
"6 c #DA0000",
"7 c #950000",
"8 c #070000",
"9 c #350000",
"0 c #F00000",
"a c #BD0000",
"b c #080000",
"c c #B10000",
"d c #880000",
"e c #FD0000",
"f c #4D0000",
"g c #0B0000",
"h c #F50000",
"i c #1A0000",
"j c #820000",
"k c #E30000",
"l c #040000",
"m c #3C0000",
"n c #FEAFAF",
"o c #FFFEFE",
"p c #FEFEFE",
"q c #FF7F7F",
"r c #840000",
"s c #FFAFAF",
"t c #FFFFFF",
"u c #C00000",
"v c #EA0000",
"w c #2F0000",
"x c #290000",
"y c #D80000",
"z c #AE0000",
"A c #FE6D6D",
"B c #FF9F9F",
"C c #FE9F9F",
"D c #FF4F4F",
"E c #690000",
"F c #C10000",
"G c #5B0000",
"H c #050000",
"I c #B70000",
"J c #E50000",
"K c #F40000",
"L c #420000",
"M c #650000",
" ",
" ",
" ..+@#$$$%&*=. ",
" -;>,''''''))))!~{. ",
" ]^/'''''''''))))))(_:. ",
" .<['''''''''''))))))))'}+. ",
" |1'''''''''''''))))))))))234 ",
" 56)'''''''''''''))))))))))))78 ",
" 90))''''''''''''')))))))))))))ab ",
" 50)))'''''''''''''))))))))))))))c4 ",
" |6))))''''''''''''')))))))))))))))d. ",
" .1'))))''''''''''''')))))))))))))))ef ",
" <''))))''''''''''''')))))))))))))))),g ",
" ][')))))''''''''''''')))))))))))))))))%. ",
" ^'''))))''''''''''''')))))))))))))))))hi ",
" -/'''))))'''''''''''''))))))))))))))))))j ",
" ;)'')))))'''''''''''''))))))))))))))))))kl ",
" >''''))))''''''''''''')))))))))))))))))))m ",
" .,'''noooopppppppppppppoooooooooooooooq)))r ",
" +))')sttttppppppppppppptttttttttttttttq)))u. ",
" @''''nttttppppppppppppptttttttttttttttq)))v. ",
" #))''nttttppppppppppppptttttttttttttttq))))g ",
" $)'''nttttppppppppppppptttttttttttttttq))))w ",
" $''''nttttppppppppppppptttttttttttttttq))))w ",
" $)'''nttttppppppppppppptttttttttttttttq))))w ",
" %)'''nttttppppppppppppptttttttttttttttq))))x ",
" &''''nttttppppppppppppptttttttttttttttq)))). ",
" *)'''nttttppppppppppppptttttttttttttttq)))y. ",
" =))''sttttppppppppppppptttttttttttttttq)))z ",
" .!'''ABBBBCCCCCCCCCCCCCBBBBBBBBBBBBBBBD)))E ",
" ~''''))))'''''''''''''))))))))))))))))))e+ ",
" {('))))))'''''''''''''))))))))))))))))))F. ",
" ._'''))))'''''''''''''))))))))))))))))))G ",
" :'''))))''''''''''''')))))))))))))))))6H ",
" .}))))))''''''''''''')))))))))))))))))< ",
" +2'))))'''''''''''''))))))))))))))))I. ",
" .3)))))''''''''''''')))))))))))))))Ji ",
" 47))))'''''''''''''))))))))))))))KL ",
" 8a)))'''''''''''''))))))))))))))M. ",
" bc))'''''''''''''))))))))))))KM. ",
" 4de''''''''''''')))))))))))JL. ",
" .f,''''''''''''))))))))))Ii ",
" g%h''''''''''))))))))6<. ",
" .ijk'''''''')))))eFGH ",
" .lmruv''''))yzE+. ",
" ..gwwwx... ",
" ",
" "};

View File

@@ -1,210 +0,0 @@
/* XPM */
static char * info_xpm[] = {
"48 48 159 2",
" c None",
". c #12165C",
"+ c #9E9EC4",
"@ c #565294",
"# c #2E3274",
"$ c #1A227C",
"% c #16229C",
"& c #262274",
"* c #362E8C",
"= c #262A9C",
"- c #121E7C",
"; c #1A2AAC",
"> c #162284",
", c #262EA4",
"' c #2A2A84",
") c #1E1E6C",
"! c #3E3A84",
"~ c #7A72B4",
"{ c #121E74",
"] c #1E2284",
"^ c #2A2E9C",
"/ c #362E9C",
"( c #D2D2E4",
"_ c #62669C",
": c #1E269C",
"< c #1A2AB4",
"[ c #6A6EAC",
"} c #121A6C",
"| c #2E2A84",
"1 c #26268C",
"2 c #3E328C",
"3 c #322E9C",
"4 c #B6B6CC",
"5 c #1626AC",
"6 c #1E268C",
"7 c #2E267C",
"8 c #363294",
"9 c #1A2694",
"0 c #22226C",
"a c #26267C",
"b c #2E2A9C",
"c c #1A1E7C",
"d c #222A9C",
"e c #162294",
"f c #1E2EBC",
"g c #2A2EAC",
"h c #6A6A9C",
"i c #2E2A94",
"j c #CACADC",
"k c #1A1A64",
"l c #16269C",
"m c #262AAC",
"n c #161E8C",
"o c #464294",
"p c #8286C4",
"q c #1A1E64",
"r c #222AB4",
"s c #6A6EB4",
"t c #1A1A6C",
"u c #BABAD4",
"v c #1E2694",
"w c #121A64",
"x c #2E2E94",
"y c #3A2E8C",
"z c #2A2A9C",
"A c #161E7C",
"B c #1A2284",
"C c #262A94",
"D c #2E2E9C",
"E c #36329C",
"F c #FEFEFC",
"G c #666AA4",
"H c #1E2AB4",
"I c #161A6C",
"J c #322A84",
"K c #2A267C",
"L c #262EB4",
"M c #1A269C",
"N c #1E2274",
"O c #1E2AA4",
"P c #221E6C",
"Q c #423E8C",
"R c #222284",
"S c #E6E6EC",
"T c #22269C",
"U c #6E6EA4",
"V c #3232A4",
"W c #BAB6D4",
"X c #1A26AC",
"Y c #222684",
"Z c #3A328C",
"` c #22227C",
" . c #222AAC",
".. c #222EB4",
"+. c #8A86BC",
"@. c #1A1E74",
"#. c #161A5C",
"$. c #322E8C",
"%. c #3A329C",
"&. c #A29ECC",
"*. c #26227C",
"=. c #362E94",
"-. c #262AA4",
";. c #121E84",
">. c #16228C",
",. c #262EAC",
"'. c #2A2A8C",
"). c #1E1E74",
"!. c #7A76B4",
"~. c #161E74",
"{. c #1E228C",
"]. c #2A2EA4",
"^. c #6266A4",
"/. c #1E26A4",
"(. c #1A2ABC",
"_. c #121A74",
":. c #2E2A8C",
"<. c #262694",
"[. c #3E3294",
"}. c #322EA4",
"|. c #B6B6D4",
"1. c #222274",
"2. c #262684",
"3. c #222AA4",
"4. c #1A2294",
"5. c #2E2EAC",
"6. c #6E6AA4",
"7. c #322A94",
"8. c #1626A4",
"9. c #8E8ABC",
"0. c #4A429C",
"a. c #6E6EBC",
"b. c #222694",
"c. c #2A2A94",
"d. c #1A1E6C",
"e. c #BABADC",
"f. c #3A2E94",
"g. c #2A2AA4",
"h. c #161E84",
"i. c #1A228C",
"j. c #2E2EA4",
"k. c #3632A4",
"l. c #666AAC",
"m. c #1E2ABC",
"n. c #161A74",
"o. c #322A8C",
"p. c #2A2684",
"q. c #1A26A4",
"r. c #1E227C",
"s. c #1E2AAC",
"t. c #423E94",
"u. c #E6E6F4",
"v. c #6E6EAC",
"w. c #1A26B4",
"x. c #22268C",
"y. c #3A3294",
"z. c #222EBC",
"A. c #161A64",
"B. c #322E94",
" ",
" ",
" ",
" ",
" 7 7 7 7 7 7 7 7 & ",
" 2 2 2 2 2 2 y y y f.f.[.y 7 *. ",
" J y 2 2 2 2 2 [.[.[.[.y.=.=.f.=./ B.p. ",
" 2 2 2 2 [.2 [.[.f.y y y * * =.=.B./ B.3 o.*.*. ",
" y 2 2 [.2 [.2 2 y [.[.f.f.o.* $.$.B.B.7.D 3 D }.D ",
" 2 2 [.[.2 [.2 [.f.[.y ~ ( F F W 0.$.:.i x 7.3 D D <.R ",
" y 2 [.[.[.2 [.2 2 y y ~ F F F F F u.o :.:.c.c.b b D }.}.g. ",
" 2 [.[.2 [.2 [.2 [.y 2 Z ( F F F F F F +.7 '.:.:.i D b ].].z R ",
" y 2 2 [.[.[.[.[.2 f.y y y F F F F F F F |.p.p.'.'.<.z z g.].].5.m ",
" 2 2 [.t.[.[.2 2 2 f.2 f.* * u.F F F F F F + *.2.2.C '.c.z ^ ].g m = n ",
" y 2 [.2 [.[.[.[.2 f.2 f.* * &.F F F F F F @ a *.2.2.C C z = g.].,.g. . ",
" 2 2 [.[.[.[.[.2 [.[.[.f.* o.J $.u F F F u.U 1.0 Y *.2.1 <.C ^ -.m g.L = n ",
" 2 2 2 [.2 t.[.[.f.[.Z y.* $.J 7 | Q U 6.P 1.P P ` ` 2.1 <.= = , ,.,.m m . ",
" 2 [.[.[.[.[.[.2 f.2 f.f.* =.o.:.| K & & 0 0 P N 1.1.` R 2.d <.= -.-.m ..../.n ",
" 2 2 [.2 [.2 [.[.[.[.y.=.=.* o.:.p.K ! 6.h 4 4 ) ) ).r.6 Y b.= = , ,.,.m ..r r ",
" [.2 t.[.[.[.[.[.f.y.8 y.* B.9.W S F F F F F F ) ) N 1.R R x.b.= 3.m m ..m ..s. ",
" 7 [.2 [.2 [.[.[.[.[.f.=.=.=.o.e.F F F F F F F F ) ) ).N R x.b.T 3.3. .m ..r H m.H ",
" 2 [.[.[.[.[.[.[.[.f.%.=.=.$.B.:.o W F F F F F F k q N r.] R b.d T , . .r ....s.n ",
" y 2 2 [.[.[.[.[.%.f.%.=.=.B.$.:.'.v.F F F F F F t k ) N ] 6 x.d T 3... .H r H m.< ",
" 2 [.[.[.[.[.[.%.y.%.=.E / 7.7.p.p.v.F F F F F F q d.t @.r.R v T O . .....f r X n ",
" y 2 2 [.[.[.[.%.=.%.=.B.B.x B.:.| v.F F F F F F k d.d.c $ {.6 T d O .r r f f m.(. ",
" 2 [.[.[.[.[.%.%.%./ E / 3 7.i '.2.v.F F F F F F A.A.t @.r.] b.: /. .s.H H H m.5 ;. ",
" J 2 [.[.[.[.f.%.8 / E 8 3 i i :.p.v.F F F F F F k A.d.~.$ B 6 : : /.s.H m.m.f (.(. ",
" [.[.[.%.[.%.%./ f.E / 3 3 B.i p.1 v.F F F F F F . A.I @.c {.{.: O s. .H H m.(.w.;. ",
" 7 [.[.%.f.%.%.E / V =.3 D D ^ '.1 v.F F F F F F #.A.I @.A i.9 : O s.s.H f m.(.(.w. ",
" [.[.[.[.%.%.E E E / 3 3 7.i i c.2.v.F F F F F F . . A.~.c B {.M /.X H H (.(.(.w.;. ",
" [.%.%./ %.f./ V 3 3 D D c.c.<.Y v.F F F F F F #.A.A.~.A B 4.9 /.X ; < f f (.(. ",
" %.f.E %./ k.k./ V }.}.D D c.'.1 [ F F F F F F . . } I c >.i.M q.; H < (.(.(.5 ",
" J f.k.E E E / / 3 V 3 D b z 1 x.v.F F F F F F #.. A.} c B 4.M /.X < (.(.(.(.(. ",
" %.%.%.E / V }.V D j.z z c.C 1 [ F F F F F F . A.} ~.A h.4.4.q.; w.(.(.(.5 ",
" 7 k./ V / V D }.j.j.^ z z <.x.[ F F F F F F . . . _.A h.4.% q.; 5 w.w.(.(. ",
" / k./ V }.}.j.j.j.b z C C R l.F F F F F F . } I ~.A >.e M 5 5 (.(.(.5 ",
" 7 V 3 V V V }.j.].].g.= C <.s F F F F F F # w } n.A >.e 4.X 5 < (.w.(. ",
" / k.}.}.j.j.j.j.g.z = a.p u.F F F F F F j _ _ - - n e 8.5 5 w.w.5 ",
" V V j.j.j.].].].z = F F F F F F F F F F F F n.;.n e % X 5 (.(. ",
" j.V j.j.j.].-.-.<.a.a.s [ l.G G _ _ _ ^.^.- h.e % 8.5 < 5 ",
" 5.].g j.]., , d T b.{.{.c A ~._.} } _.n.;.;.e % % 5 5 ",
" 5.j.].g g.-.-.d : v i.> A A ~._.- - - >.e e % 5 % ",
" g g.g -., 3.d : v v i.B h.A n.h.;.;.;.n % 8.% ",
" -.,. .-.3.T : 4.{.>.>.>.>.;.>.n % % % ",
" 3.-.3.3.O M 4.4.i.n e n e e e ",
" : : : /.4.% e n ;. ",
" ",
" "};

View File

@@ -1,216 +0,0 @@
/* XPM */
static char * question_xpm[] = {
"48 48 165 2",
" c None",
". c #000000",
"+ c #080808",
"@ c #2A2A2A",
"# c #434343",
"$ c #545454",
"% c #626262",
"& c #6A6A6A",
"* c #6E6E6E",
"= c #424242",
"- c #525252",
"; c #898989",
"> c #DCDCDC",
", c #E5E5E5",
"' c #EDEDED",
") c #F4F4F4",
"! c #F9F9F9",
"~ c #FCFCFC",
"{ c #FFFFFF",
"] c #888888",
"^ c #4F4F4F",
"/ c #050505",
"( c #0F0F0F",
"_ c #9C9C9C",
": c #E6E6E6",
"< c #9B9B9B",
"[ c #1F1F1F",
"} c #A1A1A1",
"| c #E3E3E3",
"1 c #4D4D4D",
"2 c #D6D6D6",
"3 c #ECECEC",
"4 c #D9D9D9",
"5 c #C6C6C6",
"6 c #B0B0B0",
"7 c #848484",
"8 c #D3D3D3",
"9 c #010101",
"0 c #8B8B8B",
"a c #F2F2F2",
"b c #F3F3F3",
"c c #A6A6A6",
"d c #5E5E5E",
"e c #2F2F2F",
"f c #272727",
"g c #202020",
"h c #4E4E4E",
"i c #8A8A8A",
"j c #0B0B0B",
"k c #B6B6B6",
"l c #5D5D5D",
"m c #131313",
"n c #9A9A9A",
"o c #C9C9C9",
"p c #878787",
"q c #0A0A0A",
"r c #373737",
"s c #DADADA",
"t c #B4B4B4",
"u c #B1B1B1",
"v c #030303",
"w c #767676",
"x c #FDFDFD",
"y c #FAFAFA",
"z c #383838",
"A c #F8F8F8",
"B c #AFAFAF",
"C c #070707",
"D c #818181",
"E c #555555",
"F c #BDBDBD",
"G c #7D7D7D",
"H c #3C3C3C",
"I c #F6F6F6",
"J c #535353",
"K c #242424",
"L c #ABABAB",
"M c #393939",
"N c #BBBBBB",
"O c #EAEAEA",
"P c #A3A3A3",
"Q c #4B4B4B",
"R c #616161",
"S c #CFCFCF",
"T c #060606",
"U c #EFEFEF",
"V c #B9B9B9",
"W c #303030",
"X c #161616",
"Y c #2C2C2C",
"Z c #C0C0C0",
"` c #2E2E2E",
" . c #858585",
".. c #E4E4E4",
"+. c #1C1C1C",
"@. c #D4D4D4",
"#. c #828282",
"$. c #C7C7C7",
"%. c #3A3A3A",
"&. c #090909",
"*. c #151515",
"=. c #8E8E8E",
"-. c #F7F7F7",
";. c #C4C4C4",
">. c #EBEBEB",
",. c #CECECE",
"'. c #3D3D3D",
"). c #676767",
"!. c #F1F1F1",
"~. c #FBFBFB",
"{. c #353535",
"]. c #212121",
"^. c #EEEEEE",
"/. c #444444",
"(. c #DEDEDE",
"_. c #020202",
":. c #6B6B6B",
"<. c #E1E1E1",
"[. c #575757",
"}. c #111111",
"|. c #939393",
"1. c #ADADAD",
"2. c #6C6C6C",
"3. c #929292",
"4. c #4A4A4A",
"5. c #1E1E1E",
"6. c #3B3B3B",
"7. c #A0A0A0",
"8. c #696969",
"9. c #FEFEFE",
"0. c #CBCBCB",
"a. c #F0F0F0",
"b. c #0E0E0E",
"c. c #DFDFDF",
"d. c #808080",
"e. c #D0D0D0",
"f. c #636363",
"g. c #323232",
"h. c #D2D2D2",
"i. c #333333",
"j. c #292929",
"k. c #484848",
"l. c #646464",
"m. c #F5F5F5",
"n. c #B2B2B2",
"o. c #494949",
"p. c #E2E2E2",
"q. c #3F3F3F",
"r. c #0D0D0D",
"s. c #E0E0E0",
"t. c #2D2D2D",
"u. c #3E3E3E",
"v. c #C8C8C8",
"w. c #D1D1D1",
"x. c #7C7C7C",
"y. c #141414",
"z. c #A4A4A4",
"A. c #C2C2C2",
"B. c #262626",
"C. c #191919",
"D. c #999999",
"E. c #0C0C0C",
"F. c #101010",
"G. c #787878",
"H. c #797979",
" ",
" ",
" ",
" ",
" ",
" ",
" . . . . . . . . . . . . . . . . ",
" . . . . + @ # $ % & * * & % $ = @ + . . . . ",
" . . . . - ; > , ' ) ! ~ { { ~ ! ) ' , > ] ^ . . . . ",
" . . / ( _ : { { { { { { { { { { { { { { { { { { : < ( / . . ",
" . . [ } | { { { { { { { { { { { { { { { { { { { { { { | } [ . . ",
" . . 1 2 { { { { { { { { 3 4 5 6 7 7 7 < 5 8 : ! { { { { { { 2 1 . . . ",
" . . 9 0 a { { { { { { { b c d e 9 9 9 f 9 9 9 g h i 4 { { { { { { a ; 9 . . ",
" . . j k { { { { { { { { ' l m 9 9 9 9 n o p 9 9 9 9 q r s { { { { { { { t q . . ",
" . . + u { { { { { { { { { # v 9 9 9 9 w x { y z 9 9 9 9 9 @ A { { { { { { { B C . . ",
" . . . D y { { { { { { { { { 9 9 9 9 9 j ' { { { E 9 9 9 9 9 9 F { { { { { { { y G . . . ",
" . . H I { { { { { { { { { { J 9 9 9 9 ^ { { { { K 9 9 9 9 9 9 L { { { { { { { { I M . . . ",
" . . . N { { { { { { { { { { { O P Q Q R S { { { } 9 9 9 9 9 9 T U { { { { { { { { { V . . . ",
" . . W ! { { { { { { { { { { { { { { { { { { A 6 X 9 9 9 9 9 Y Z { { { { { { { { { { ! ` . . ",
" . . .{ { { { { { { { { { { { { { { { { { ..7 ( 9 9 9 9 +.* @.{ { { { { { { { { { { { #.. . . ",
". . . $.{ { { { { { { { { { { { { { { { { < %.&.9 9 9 *.=.5 -.{ { { { { { { { { { { { { ;.. . . ",
". . . >.{ { { { { { { { { { { { { { { ,.'.+ . . . . ).!.~ { { { { { { { { { { { { { { { O . . . ",
". . . ~.{ { { { { { { { { { { { { { O {.. . . . . ].^.{ { { { { { { { { { { { { { { { { ~.. . . ",
". . . A { { { { { { { { { { { { { { k 9 9 9 9 9 9 /.{ { { { { { { { { { { { { { { { { { A . . . ",
". . . (.{ { { { { { { { { { { { { { 5 _.. . . . . q :.4 U U <.{ { { { { { { { { { { { { > . . . ",
". . . 6 { { { { { { { { { { { { { { { [.&.. . . . . . . . }.|.{ { { { { { { { { { { { { 1.. . . ",
". . . 2.{ { { { { { { { { { { { { { { a 3.4.5.9 9 9 5.6.).7.a { { { { { { { { { { { { { 8.. . . ",
" . . ( !.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.<.0.F F F 0.s a.9.9.9.9.9.9.9.9.9.9.9.9.9.9.!.b.. . . ",
" . . . D { { { { { { { { { { { { { { { { { U c.c.c.U { { { { { { { { { { { { { { { { d.. . . ",
" . . . ( 8 { { { { { { { { { { { { { { { e.f.g.g.g.f.;.{ { { { { { { { { { { { { { h.b.. . . ",
" . . . 4.) { { { { { { { { { { { { { ' i.9 9 9 9 9 j.' { { { { { { { { { { { { ) k.. . . ",
" . . . l.m.{ { { { { { { { { { { { n.. . . . . . . n.{ { { { { { { { { { { m.f.. . . . ",
" . . . o.p.{ { { { { { { { { { { F 9 9 9 9 9 9 9 5 { { { { { { { { { { p.k.. . . . ",
" . . . @ 0.{ { { { { { { { { { b q.. . . . . d { { { { { { { { { { b j.. . . . ",
" . . . r.7.{ { { { { { { { { { s.* = t.= < 3 { { { { { { { { { { A e . . . ",
" . . . . u._ >.y { { { { { { { { { { { { { { { { { { { { { { { { a - . . ",
" . . . . . W % v., { { { { { { { { { { { { { { , w.e.>.{ { { { { U x.T ",
" . . . . . y.f D z.A.4 >.-.x x -.>.4 A.z.d.B.C.C.Y i c h.{ { { ) D.. ",
" . . . . . . / &.E.( F.}.}.F.b.E.&./ . . . . . 9 T E.}.] 5 ' ) G.. ",
" . . . . . . . . . . . . . . . . . . . . . . . . . . . . M H.H.. ",
" . . . . . . . . . . . . . . . . . . . . . . . . ",
" . . . . ",
" ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,202 +0,0 @@
/* XPM */
static char * warning_xpm[] = {
"48 48 151 2",
" c None",
". c #C70707",
"+ c #F80808",
"@ c #EA0808",
"# c #A50505",
"$ c #E10808",
"% c #F70808",
"& c #E85959",
"* c #F80909",
"= c #F90909",
"- c #CD0707",
"; c #EE0808",
"> c #F12B2B",
", c #F5F4F4",
"' c #DE5F5F",
") c #AE0606",
"! c #D2ACAC",
"~ c #FEFEFE",
"{ c #E5DFDF",
"] c #F91717",
"^ c #E30808",
"/ c #DC4C4C",
"( c #FCFCFC",
"_ c #D68585",
": c #DB0707",
"< c #F80C0C",
"[ c #DECDCD",
"} c #F6F5F5",
"| c #ED2B2B",
"1 c #F50808",
"2 c #D66D6D",
"3 c #FFFFFF",
"4 c #D2A9A9",
"5 c #BB0606",
"6 c #E70808",
"7 c #F11A1A",
"8 c #EDE9E9",
"9 c #E84646",
"0 c #D59696",
"a c #DDCCCC",
"b c #F90E0E",
"c c #CE0707",
"d c #EA3030",
"e c #F8F8F8",
"f c #383838",
"g c #000000",
"h c #555555",
"i c #DE6D6D",
"j c #B20606",
"k c #DAB9B9",
"l c #A9A9A9",
"m c #AAAAAA",
"n c #EAE6E6",
"o c #F81919",
"p c #F30808",
"q c #E05252",
"r c #D58D8D",
"s c #E00808",
"t c #F81111",
"u c #E1D5D5",
"v c #C6C6C6",
"w c #C7C7C7",
"x c #F22F2F",
"y c #CF7979",
"z c #D4B4B4",
"A c #F90A0A",
"B c #C60707",
"C c #EF0808",
"D c #EF2222",
"E c #EEEBEB",
"F c #E14E4E",
"G c #D69E9E",
"H c #E0D2D2",
"I c #F91111",
"J c #D40707",
"K c #E93A3A",
"L c #545454",
"M c #D97373",
"N c #C80707",
"O c #F80A0A",
"P c #DAC3C3",
"Q c #717171",
"R c #727272",
"S c #EFEDED",
"T c #F91F1F",
"U c #E45757",
"V c #CE9999",
"W c #E40808",
"X c #F81313",
"Y c #E3DADA",
"Z c #F9F9F9",
"` c #F13737",
" . c #F60808",
".. c #D37979",
"+. c #D8BDBD",
"@. c #F90B0B",
"#. c #C90707",
"$. c #F12424",
"%. c #F0EFEF",
"&. c #DB5656",
"*. c #D39F9F",
"=. c #1C1C1C",
"-. c #E7E0E0",
";. c #D50707",
">. c #F40808",
",. c #E93F3F",
"'. c #FBFBFB",
"). c #D77575",
"!. c #F90C0C",
"~. c #D9C5C5",
"{. c #F1EEEE",
"]. c #F42121",
"^. c #E60808",
"/. c #F90808",
"(. c #DC5F5F",
"_. c #E2E2E2",
":. c #D19D9D",
"<. c #F91616",
"[. c #E9E3E3",
"}. c #FAFAFA",
"|. c #E33D3D",
"1. c #D58383",
"2. c #8D8D8D",
"3. c #E3E3E3",
"4. c #D9C0C0",
"5. c #F70909",
"6. c #F02C2C",
"7. c #DA5D5D",
"8. c #BC0606",
"9. c #D0A9A9",
"0. c #E8DFDF",
"a. c #F51414",
"b. c #DF0808",
"c. c #E34646",
"d. c #FDFDFD",
"e. c #393939",
"f. c #D57E7E",
"g. c #F80B0B",
"h. c #DDCDCD",
"i. c #F4F3F3",
"j. c #F12626",
"k. c #ED0808",
"l. c #E35D5D",
"m. c #EBE9E9",
"n. c #ECEAEA",
"o. c #D99292",
"p. c #A10505",
"q. c #F80E0E",
"r. c #F80D0D",
"s. c #F90F0F",
"t. c #F20808",
" ",
" ",
" ",
" ",
" ",
" ",
" . + @ ",
" + + + # ",
" $ + + + % ",
" + % & * = - ",
" ; % > , ' = = ",
" ) + + ! ~ { ] = ^ ",
" + + / ( ~ ~ _ * = ",
" : + < [ ~ ~ ~ } | = 1 ",
" + % 2 ~ ~ ~ ~ 3 4 = = 5 ",
" 6 + 7 8 ~ ~ ~ ~ 3 3 9 = = ",
" + % 0 ~ ~ ~ ~ ~ 3 3 a b = c ",
" % % d e ~ f g g g h 3 3 i = = ",
" j + * k ~ l g g g g g m 3 n o = p ",
" + + q ~ ~ l g g g g g m 3 3 r = = ",
" s + t u ~ ~ v g g g g g w 3 3 e x = = ",
" + + y ~ ~ ~ ~ g g g g g 3 3 3 3 z A = B ",
" C + D E ~ ~ ~ ~ g g g g g 3 3 3 3 ~ F = % ",
" + % G ~ ~ ~ ~ ~ f g g g h 3 3 3 3 3 H I = J ",
" + % K ( ~ ~ ~ ~ ~ L g g g h 3 3 3 3 3 3 M = = ",
" N + O P ~ ~ ~ ~ ~ ~ Q g g g R 3 3 3 3 3 3 S T = @ ",
" = % U ~ ~ ~ ~ ~ ~ ~ l g g g m 3 3 3 3 3 3 3 V * = ",
" W = X Y ~ ~ ~ ~ ~ ~ ~ l g g g m 3 3 3 3 3 3 3 Z ` = . ",
" = = ..~ ~ ~ ~ ~ ~ ~ ~ ~ g g g 3 3 3 3 3 3 3 3 3 +.@.= #. ",
" .= $.%.~ ~ ~ ~ ~ ~ ~ ~ ~ g g g 3 3 3 3 3 3 3 3 3 3 &.= = ",
" = * *.~ ~ ~ ~ ~ ~ ~ ~ ~ ~ =.g f 3 3 3 3 3 3 3 3 3 3 -.I = ;. ",
" >.= ,.'.~ ~ ~ ~ ~ ~ ~ ~ ~ ~ L g L 3 3 3 3 3 3 3 3 3 3 3 ).= = ",
" N = !.~.3 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ v l v 3 3 3 3 3 3 3 3 3 3 3 {.].= ^. ",
" /.= (.3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ v l _.3 3 3 3 3 3 3 3 3 3 3 3 :.= = ",
" : + <.[.3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ L g g g m 3 3 3 3 3 3 3 3 3 3 3 }.|.= = ",
" = + 1.3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ 2.g g g g g 3.3 3 3 3 3 3 3 3 3 3 3 4.A = - ",
" p 5.6.} 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ L g g g g g m 3 3 3 3 3 3 3 3 3 3 3 3 7.= = ",
" 8.+ * 9.3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ Q g g g g g w 3 3 3 3 3 3 3 3 3 3 3 3 0.a.= b. ",
" % % c.d.3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ _.=.g g g e.3 3 3 3 3 3 3 3 3 3 3 3 3 3 f.= = ",
" - * g.h.~ 3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ _.Q L Q 3.3 3 3 3 3 3 3 3 3 3 3 3 3 3 i.j.= k. ",
" = = l.m.m.n.n.n.n.m.m.m.m.m.m.m.m.m.m.m.m.m.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.o.* = p. ",
" ^.* + g.q.r.b s.b s.r.< r.< r.r.< r.< r.< r.r.b s.b s.s.b s.b s.s.b s.b s.s.b b A = = ",
" t.= * + * + = = = = + + + + + + + + + + + + + = = = = = = = = = = = = = = = = = = = = ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */
"20 20 16 1",
" c Gray0",
". c #800000",
"X c #008000",
"o c #808000",
"O c #000080",
"+ c #800080",
"@ c #008080",
"# c None",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"####################",
"####################",
"############# ######",
"####################",
"############# ######",
"########## ##### ###",
"##### ## # # ####",
"#### *:*: ## # #####",
"### ## # ##",
"### :*:*:*:*: #####",
"### *:*:*:*:* # ####",
"### :*:*:*:*: ## ###",
"### *:*:*:*:* ######",
"### :*:*:*:*: ######",
"### *:*:*:*:* ######",
"### ######",
"####################",
"####################",
"####################",
"####################"
};

View File

@@ -1,26 +0,0 @@
/* XPM */
static char *print_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c None",
". c Black",
"X c Gray100",
"o c #808000",
"O c Yellow",
/* pixels */
" ",
" ......... ",
" .XXXXXXXX. ",
" .X.....X. ",
" .XXXXXXXX. ",
" .X.....X.... ",
" .XXXXXXXX. . .",
" .......... . ..",
". . . .",
"............. .",
". ooo . . ",
". OOO ... ",
"............. . ",
" . . . ",
" ........... "
};

View File

@@ -1,27 +0,0 @@
/* XPM */
static char * repview_xpm[] = {
"20 20 4 1",
" c None",
". c #000000",
"+ c #FFFFFF",
"@ c #000083",
" ",
" ",
" ................ ",
" .++++++++++++++. ",
" .++++++++++++++. ",
" .+++....+...+.+. ",
" .++++++++++++++. ",
" .+@@@@@@@@@@@.+. ",
" .++++++++++++++. ",
" .+@+....+...+.+. ",
" .++++++++++++++. ",
" .+@+....+...+.+. ",
" .++++++++++++++. ",
" .+@+....+...+.+. ",
" .++++++++++++++. ",
" .+@+....+...+.+. ",
" .++++++++++++++. ",
" ................ ",
" ",
" "};

View File

@@ -1,32 +0,0 @@
/* XPM */
static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c None",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"##########",
"######## #",
"####### ",
"###### ",
"##### #",
" ## ##",
" ###",
"# ####",
"## #####",
"### ######"
};

View File

@@ -1,45 +0,0 @@
/* XPM */
static char *tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 7 1",
" c Gray0",
". c Cyan",
"X c Yellow",
"o c #808080808080",
"O c #c0c0c0c0c0c0",
"+ c Gray100",
"@ c None",
/* pixels */
"@@@@@@@@@@@@ @@@@@@@@@@@@@@",
"@@@@@@@@@@ XXXXXX @@@@@@@@@@@@",
"@@@@@@@@@ XXXXXXXXXX @@@@@@@@@@@",
"@@@@@@@@@ XXXXXXXXXX @@@@@@@@@@@",
"@@@@@@@@ XXXXX XXXXX @@@@@@@@@@",
"@@@@@@@ XXXXXX XXXXXX @@@@@@@@@",
"@@@@@@@ XXXXXX XXXXXX @@@@@@@@@",
"@@@@@@@ XXXXXX XXXXXX @@@@@@@@@",
"@@@@@@@ XXXXXX XXXXXX @@@@@@@@@",
"@@@@@@@ XXXXXX XXXXXX @@@@@@@@@",
"@@@@@@@@ XXXXX XXXXX @@@@@@@@@",
"@@@@@@@@oXXXXXXXXXXXX @@@@@@@@@@",
"@@@@@@@o+ XXXX XXXX o@@@@@@@@@@",
"@@@@@@o++ XXXX XXXX +o@@@@@@@@@",
"@@@@@o++++ XXX XXX +++o@@@@@@@@",
"@@@@o++.+.+ XXXXXX .+..+o@@@@@@@",
"@@@o++++++++ XXXX +++++++o@@@@@@",
"@@ +..+.+.+. oooo +.+..+.+ @@@@@",
"@@@ ++++++++ OOOO +++++++ @@@@@@",
"@@@@ ++.+.+. oooo +.+..+ @@@@@@@",
"@@@oo ++++++ OO +++++ oo@@@@@@",
"@@@ooo ++.+.+ ++.++ ooo@@@@@@",
"@@@@ooo +.+.+ ++.+ ooo@@@@@@@",
"@@@@@ooo +++++++++++ ooo@@@@@@@@",
"@@@@@@ooo +.+.+.+.+ ooo@@@@@@@@@",
"@@@@@@@ooo +++++++ ooo@@@@@@@@@@",
"@@@@@@@@ooo +.+.+ ooo@@@@@@@@@@@",
"@@@@@@@@@ooo +++ ooo@@@@@@@@@@@@",
"@@@@@@@@@@ooo + ooo@@@@@@@@@@@@@",
"@@@@@@@@@@@ooo ooo@@@@@@@@@@@@@@",
"@@@@@@@@@@@@ooooo@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@ooo@@@@@@@@@@@@@@@@"
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char * toparent_xpm[] = {
"16 16 5 1",
" c None",
". c #000000",
"+ c #C0E4CB",
"@ c #808080",
"# c #77C490",
" ",
" ",
" . ",
" .+.@ ",
" .+++.@ ",
" .++##+.@ ",
" .++####+.@ ",
" ....+##....@ ",
" .+##.@@@@@ ",
" .+##...... ",
" .+#######.@ ",
" .+#######.@ ",
" .+#######.@ ",
" ..........@ ",
" ",
" "};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char * up_xpm[] = {
"16 16 5 1",
" c None",
". c #000000",
"+ c #C0E4CB",
"@ c #808080",
"# c #77C490",
" ",
" . ",
" .+.@ ",
" .+++.@ ",
" .++##+.@ ",
" .++####+.@ ",
" ....+##....@ ",
" .+##.@@@@@ ",
" .+##.@ ",
" .+##.@ ",
" .+##.@ ",
" .+##.@ ",
" .+##.@ ",
" .....@ ",
" ",
" "};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,25 +0,0 @@
/* XPM */
static char *wxwin16x16_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ",
" ....... ",
" .XXXXX. ",
" .oXXXX. ",
" .oXXX.......",
".....oXXX.OOOOO.",
".+++.XXXX.oOOOO.",
".o++......oOOOO.",
".o++++. .oOOOO.",
".o++++. .OOOOO.",
".+++++. .......",
"....... ",
" ",
" "};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,41 +0,0 @@
/* XPM */
static char *wxwin32x32_xpm[] = {
"32 32 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXX..............",
" .XooXXXXXX.OOOOOOOOOOOO.",
".........XooXXXXXX.OOOOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++...........OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,558 +0,0 @@
dnl This macro was generated by
dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
dnl Do not modify, all changes will be overwritten!
dnl Conditions:
dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
AC_BAKEFILE_PRECOMP_HEADERS
dnl Conditions:
dnl ### begin block 1_COND_BUILD_DEBUG ###
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
fi
AC_SUBST(COND_BUILD_DEBUG)
dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT ###
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ###
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
dnl ### begin block 1_COND_BUILD_RELEASE ###
COND_BUILD_RELEASE="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_RELEASE=""
fi
AC_SUBST(COND_BUILD_RELEASE)
dnl ### begin block 1_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ###
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
dnl ### begin block 1_COND_DEBUG_FLAG_1 ###
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
fi
AC_SUBST(COND_DEBUG_FLAG_1)
dnl ### begin block 1_COND_DEBUG_INFO_0 ###
COND_DEBUG_INFO_0="#"
if test "x$DEBUG_INFO" = "x0" ; then
COND_DEBUG_INFO_0=""
fi
AC_SUBST(COND_DEBUG_INFO_0)
dnl ### begin block 1_COND_DEBUG_INFO_1 ###
COND_DEBUG_INFO_1="#"
if test "x$DEBUG_INFO" = "x1" ; then
COND_DEBUG_INFO_1=""
fi
AC_SUBST(COND_DEBUG_INFO_1)
dnl ### begin block 1_COND_DEPS_TRACKING_0 ###
COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0=""
fi
AC_SUBST(COND_DEPS_TRACKING_0)
dnl ### begin block 1_COND_DEPS_TRACKING_1 ###
COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1=""
fi
AC_SUBST(COND_DEPS_TRACKING_1)
dnl ### begin block 1_COND_GCC_PCH_1 ###
COND_GCC_PCH_1="#"
if test "x$GCC_PCH" = "x1" ; then
COND_GCC_PCH_1=""
fi
AC_SUBST(COND_GCC_PCH_1)
dnl ### begin block 1_COND_MONOLITHIC_0 ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
fi
AC_SUBST(COND_MONOLITHIC_0)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0 ###
COND_MONOLITHIC_0_SHARED_0="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
COND_MONOLITHIC_0_SHARED_0=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 ###
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1 ###
COND_MONOLITHIC_0_SHARED_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1)
dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 ###
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1)
dnl ### begin block 1_COND_MONOLITHIC_1 ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
fi
AC_SUBST(COND_MONOLITHIC_1)
dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_0 ###
COND_MONOLITHIC_1_SHARED_0="#"
if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
COND_MONOLITHIC_1_SHARED_0=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_0)
dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_1 ###
COND_MONOLITHIC_1_SHARED_1="#"
if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_1_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
dnl ### begin block 1_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ###
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
dnl ### begin block 1_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ###
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
dnl ### begin block 1_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ###
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
dnl ### begin block 1_COND_PLATFORM_MACOSX_1 ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1)
dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ###
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA)
dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ###
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK)
dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
dnl ### begin block 1_COND_PLATFORM_MAC_1 ###
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
fi
AC_SUBST(COND_PLATFORM_MAC_1)
dnl ### begin block 1_COND_PLATFORM_OS2_1 ###
COND_PLATFORM_OS2_1="#"
if test "x$PLATFORM_OS2" = "x1" ; then
COND_PLATFORM_OS2_1=""
fi
AC_SUBST(COND_PLATFORM_OS2_1)
dnl ### begin block 1_COND_PLATFORM_UNIX_0 ###
COND_PLATFORM_UNIX_0="#"
if test "x$PLATFORM_UNIX" = "x0" ; then
COND_PLATFORM_UNIX_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_0)
dnl ### begin block 1_COND_PLATFORM_UNIX_1 ###
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block 1_COND_PLATFORM_WIN32_0 ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
fi
AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block 1_COND_PLATFORM_WIN32_1 ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_PLATFORM_WIN32_1)
dnl ### begin block 1_COND_SHARED_0 ###
COND_SHARED_0="#"
if test "x$SHARED" = "x0" ; then
COND_SHARED_0=""
fi
AC_SUBST(COND_SHARED_0)
dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ###
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_WXUSE_EXPAT_BUILTIN ###
COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_EXPAT_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_WXUSE_ODBC_BUILTIN ###
COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_ODBC_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_WXUSE_REGEX_BUILTIN ###
COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_REGEX_BUILTIN)
dnl ### begin block 1_COND_SHARED_0_WXUSE_ZLIB_BUILTIN ###
COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_ZLIB_BUILTIN)
dnl ### begin block 1_COND_SHARED_1 ###
COND_SHARED_1="#"
if test "x$SHARED" = "x1" ; then
COND_SHARED_1=""
fi
AC_SUBST(COND_SHARED_1)
dnl ### begin block 1_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ###
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
fi
AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)
dnl ### begin block 1_COND_TOOLKIT_COCOA ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=""
fi
AC_SUBST(COND_TOOLKIT_COCOA)
dnl ### begin block 1_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_GTK ###
COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK=""
fi
AC_SUBST(COND_TOOLKIT_GTK)
dnl ### begin block 1_COND_TOOLKIT_GTK_USE_GUI_1 ###
COND_TOOLKIT_GTK_USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_MAC ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1 ###
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_MGL ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
fi
AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block 1_COND_TOOLKIT_MGL_USE_GUI_1 ###
COND_TOOLKIT_MGL_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MGL_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_MOTIF ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1 ###
COND_TOOLKIT_MOTIF_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_MSW ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
fi
AC_SUBST(COND_TOOLKIT_MSW)
dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1 ###
COND_TOOLKIT_MSW_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MSW_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_PM ###
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
fi
AC_SUBST(COND_TOOLKIT_PM)
dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1 ###
COND_TOOLKIT_PM_USE_GUI_1="#"
if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_PM_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1)
dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_TOOLKIT_X11 ###
COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11=""
fi
AC_SUBST(COND_TOOLKIT_X11)
dnl ### begin block 1_COND_TOOLKIT_X11_USE_GUI_1 ###
COND_TOOLKIT_X11_USE_GUI_1="#"
if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_X11_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
dnl ### begin block 1_COND_UNICODE_1 ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
AC_SUBST(COND_UNICODE_1)
dnl ### begin block 1_COND_USE_GUI_0 ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0=""
fi
AC_SUBST(COND_USE_GUI_0)
dnl ### begin block 1_COND_USE_GUI_1 ###
COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1=""
fi
AC_SUBST(COND_USE_GUI_1)
dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_0 ###
COND_USE_GUI_1_WXUNIV_0="#"
if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_1 ###
COND_USE_GUI_1_WXUNIV_1="#"
if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_USE_GUI_1_WXUNIV_1=""
fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 1_COND_USE_SOSYMLINKS_1 ###
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
fi
AC_SUBST(COND_USE_SOSYMLINKS_1)
dnl ### begin block 1_COND_USE_SOVERLINUX_1 ###
COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX_1=""
fi
AC_SUBST(COND_USE_SOVERLINUX_1)
dnl ### begin block 1_COND_USE_SOVERSION_0 ###
COND_USE_SOVERSION_0="#"
if test "x$USE_SOVERSION" = "x0" ; then
COND_USE_SOVERSION_0=""
fi
AC_SUBST(COND_USE_SOVERSION_0)
dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ###
COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1=""
fi
AC_SUBST(COND_USE_SOVERSOLARIS_1)
dnl ### begin block 1_COND_WXUNIV_1 ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
fi
AC_SUBST(COND_WXUNIV_1)
dnl ### begin block 1_COND_WXUSE_EXPAT_BUILTIN ###
COND_WXUSE_EXPAT_BUILTIN="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBJPEG_BUILTIN ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBPNG_BUILTIN ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBTIFF_BUILTIN ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 1_COND_WXUSE_ODBC_BUILTIN ###
COND_WXUSE_ODBC_BUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBC_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
dnl ### begin block 1_COND_WXUSE_REGEX_BUILTIN ###
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
dnl ### begin block 1_COND_WXUSE_ZLIB_BUILTIN ###
COND_WXUSE_ZLIB_BUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)

View File

@@ -1,2 +0,0 @@
#!/bin/sh
autoconf

File diff suppressed because it is too large Load Diff

View File

@@ -1,493 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<!-- load python module with wxwindows helpers: -->
<using module="wxwin"/>
<include file="config.bkl"/>
<!-- ================================================================== -->
<!-- wxWindows version numbers: -->
<!-- ================================================================== -->
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
<set var="WX_VERSION" make_var="1">
$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</set>
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
<set var="WXSOVERSION">
<if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
</set>
<set var="WXMACVERSION">$(WX_VERSION)</set>
<set var="WXWIN32DLLVERSION">
<if cond="WX_STABLE_BRANCH=='1'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
</set>
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
<!-- ================================================================== -->
<set var="PORTNAME">
<if cond="USE_GUI=='0'">base</if>
<if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
</set>
<set var="WXBASEPORT">
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
<set var="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
<if cond="not isdefined('COMPILER')">gcc</if>
</set>
<set var="WXCOMPILER">
<if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
</set>
<set var="VENDORTAG">
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
</set>
<set var="WXDEBUGFLAG">
<if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
<if cond="DEBUG_FLAG=='1'">d</if>
</set>
<set var="WXUNICODEFLAG">
<if cond="UNICODE=='1'">u</if>
</set>
<set var="WXNAMESUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
<set var="WXUNIVNAME">
<if cond="WXUNIV=='1'">univ</if>
</set>
<set var="WXUNIV_DEFINE">
<if cond="WXUNIV=='1'">__WXUNIVERSAL__</if>
</set>
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">
wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
</set>
<set var="WXNAMEPREFIXGUI">
wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
<if cond="PLATFORM_WIN32=='1'">
wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
</set>
<set var="WXDLLNAMEPREFIXGUI">
<if cond="PLATFORM_WIN32=='1'">
wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
</set>
<set var="WXDLLVERSIONTAG">
<if cond="PLATFORM_WIN32=='1'"></if>
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_ADV">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
<set var="WXLIB_XML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
</set>
<set var="WXLIB_ODBC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('odbc')))</if>
</set>
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
<!-- =============================================================== -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf' and SHARED=='0'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
</if>
<if cond="FORMAT!='autoconf' and SHARED=='1'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG)
</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="SETUPHDIR" make_var="1">
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
</if>
<!-- =============================================================== -->
<!-- Templates for libs: -->
<!-- =============================================================== -->
<set var="DEBUGINFO">
<if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
<if cond="DEBUG_INFO=='1'">on</if>
<if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
<if cond="DEBUG_INFO=='0'">off</if>
</set>
<set var="DEBUGRUNTIME">
<if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
<if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
</set>
<set var="OPTIMIZEFLAG">
<if cond="BUILD=='debug'">off</if>
<if cond="BUILD=='release'">speed</if>
</set>
<set var="DEBUG_DEFINE">
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
</set>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
</set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>multi</threading>
<runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
</template>
<template id="anylib">
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
<libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWindows; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
</template>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
<!-- =============================================================== -->
<!-- 3rd party libraries: -->
<include file="regex.bkl"/>
<include file="zlib.bkl"/>
<include file="png.bkl"/>
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWindows libs: -->
<!-- =============================================================== -->
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<include>$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
</template>
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS)</ldlibs>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="COMPILER=='bcc'">
<sys-lib>import32</sys-lib>
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="COMPILER!='bcc'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>comdlg32</sys-lib>
<sys-lib>winspool</sys-lib>
<sys-lib>winmm</sys-lib>
<sys-lib>shell32</sys-lib>
<sys-lib>comctl32</sys-lib>
<sys-lib>odbc32</sys-lib>
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
</if>
</template>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="FORMAT=='msvc6prj'">
<msvc-headers>wx/msw/setup.h</msvc-headers>
<set var="__custom_build_files" append="1">
include\wx\msw\setup.h
</set>
<set var="__custom_build_include_wx_msw_setup_h">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
</if>
</define-tag>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
<ldlibs>$(EXTRALIBS_GUI)</ldlibs>
</template>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf'">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/dummy.cpp
</precomp-headers-gen>
</if>
<precomp-headers-header>wx/wxprec.h</precomp-headers-header>
<precomp-headers>on</precomp-headers>
<precomp-headers-file>wxprec_$(id)</precomp-headers-file>
<precomp-headers-exclude>
src/common/unzip.c
src/common/extended.c
src/msw/gsocket.c
src/msw/gsockmsw.c
</precomp-headers-exclude>
</if>
<if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
<msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
<msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
<msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
<msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
<msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
<msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
<msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
<msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
<msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
<msvc-file-group>Common Headers:*wx/*.h</msvc-file-group>
</if>
</template>
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
<mac_version>$(WXMACVERSION)</mac_version>
</template>
<template id="wx_3rdparty_dependencies">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_3rdparty_includes">
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>
<include>$(INC_EXPAT)</include>
</template>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
</template>
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_nomono"/>
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>
<!-- =============================================================== -->
<!-- Templates for building wxWindows plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION">
<if cond="PLATFORM_UNIX=='1'">
-$(WXVER_MAJOR).$(WXVER_MINOR)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)
</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION">
<if cond="PLATFORM_UNIX=='1'">
-$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
</if>
</set>
</if>
<define-rule name="wx-base-plugin" extends="module">
<template>
<dllname>
$(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
</template>
</define-rule>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
$(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
</template>
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
</makefile>

View File

@@ -1,36 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="not isdefined('file_common_samples_included')">
<include file="common.bkl"/>
</if>
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
<!-- =============================================================== -->
<template id="wx_contrib_lib" template="wx_lib_b">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<if cond="isdefined('file_common_samples_included')">
<template id="wx_contrib_sample" template="wx_sample">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
</if>
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
</template>
</makefile>

View File

@@ -1,86 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWindows samples: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<set var="MACOSX_RESOURCES">
<if cond="TOOLKIT=='MAC'">
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
</if>
</set>
</if>
<set var="DLLFLAG">
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_util_b" template="wx">
<include>$(SRCDIR)</include>
<define>$(DLLFLAG)</define>
</template>
<template id="wx_util" template="wx_util_b">
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
<include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files -->
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
</template>
<template id="wx_util_console" template="wx_util_b">
<app-type>console</app-type>
</template>
<template id="wx_sample" template="wx_util">
<if cond="FORMAT=='autoconf'">
<wx-mac-app-bundle/>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command>
</if>
</template>
<template id="wx_sample_console" template="wx_util_console">
<if cond="FORMAT=='autoconf'">
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<__command>$(SAMPLES_RPATH_POSTLINK)</__command>
</if>
</template>
<!-- =============================================================== -->
<!-- Support for samples data files: -->
<!-- =============================================================== -->
<define-rule name="wx-data" extends="copy-files">
<template>
<dependency-of>all</dependency-of>
<dstdir>$(BUILDDIR)</dstdir>
<srcdir>$(SRCDIR)</srcdir>
</template>
<!--
VS - FIXME:
Don't clean the files because it would wipe out sources files if
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
but it would be better to delete the files during "make clean" if
BUILDDIR!=SRCDIR.
<define-tag name="files">
<clean-files>
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
</clean-files>
</define-tag>
-->
</define-rule>
<if cond="FORMAT=='autoconf'">
<include file="mac_bundles.bkl"/>
</if>
</makefile>

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" ?>
<bakefile-manifest>
<format id="wx24dsp">
<description>
src/wxWindows.dsp which makes same files as 2.4 version
</description>
<default-filename>wxWindows.dsp</default-filename>
</format>
</bakefile-manifest>

View File

@@ -1,3 +0,0 @@
This is Bakefile backend that generates wx2.4-compatible VC++ project file
(src/wxWindows.dsp).

View File

@@ -1,63 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="win32.bkl"/>
<set var="COMPILER">vc</set>
<define-rule name="__fake">
<define-tag name="sources"/>
<define-tag name="libname"/>
<define-tag name="dllname"/>
<define-tag name="dirname"/>
<define-tag name="dependency-of"/>
<define-tag name="debug-info"/>
<define-tag name="debug-runtime-libs"/>
<define-tag name="runtime-libs"/>
<define-tag name="optimize"/>
<define-tag name="threading"/>
<define-tag name="cppflags"/>
<define-tag name="cflags"/>
<define-tag name="cxxflags"/>
<define-tag name="ldflags"/>
<define-tag name="ldlibs"/>
<define-tag name="define"/>
<define-tag name="include"/>
<define-tag name="install-to"/>
<define-tag name="install-if"/>
<define-tag name="installable"/>
<define-tag name="dir"/>
<define-tag name="lib-path"/>
<define-tag name="precomp-headers"/>
<define-tag name="precomp-headers-gen"/>
<define-tag name="precomp-headers-header"/>
<define-tag name="precomp-headers-file"/>
<define-tag name="precomp-headers-exclude"/>
<define-tag name="version"/>
<define-tag name="so_version"/>
<define-tag name="mac_version"/>
<define-tag name="depends"/>
<define-tag name="sys-lib"/>
<define-tag name="library"/>
<define-tag name="command"/>
</define-rule>
<define-rule name="exe" extends="__fake"/>
<define-rule name="dll" extends="__fake"/>
<define-rule name="module" extends="__fake"/>
<define-rule name="lib" extends="__fake"/>
<define-rule name="action" extends="__fake"/>
<define-rule name="phony" extends="__fake"/>
<define-rule name="subproject" extends="__fake"/>
<set var="ALL_SOURCES" eval="0">
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
</set>
<output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
<set var="FORMAT_OUTPUT_VARIABLES">
ALL_SOURCES,ALL_HEADERS
</set>
</makefile>

View File

@@ -1,457 +0,0 @@
@{
used = {}
def mkgroup(lst, name, mask):
x = [s for s in lst if s.startswith(mask)]
for s in x:
used[s] = 1
x.sort()
return (name,x)
sources = ALL_SOURCES.split()
SOURCES = []
SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
otherSrcs = [x for x in sources if x not in used]
otherSrcs.sort()
SOURCES.append(('Other Sources', otherSrcs))
headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
HEADERS = []
HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
commonHdrs = [x for x in headers if x not in used]
commonHdrs.sort()
HEADERS.insert(0, ('Common', commonHdrs))
}@
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxWindows - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseUnicodeDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugUnicodeDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseUnicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseUnicode"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugUnicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugUnicode"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../Release"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../Debug"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseDebug"
# PROP Intermediate_Dir "ReleaseDebug"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ENDIF
# Begin Target
# Name "wxWindows - Win32 Release Unicode DLL"
# Name "wxWindows - Win32 Debug Unicode DLL"
# Name "wxWindows - Win32 Release Unicode"
# Name "wxWindows - Win32 Debug Unicode"
# Name "wxWindows - Win32 Release DLL"
# Name "wxWindows - Win32 Debug DLL"
# Name "wxWindows - Win32 Release"
# Name "wxWindows - Win32 Debug"
# Name "wxWindows - Win32 Release With Debug Info"
@[for group in SOURCES:@
# Begin Group "@group[0]"
# PROP Default_Filter ""
@[for src in group[1]:@
# Begin Source File
SOURCE=.\@src[4:].replace('/','\\')
@[if src=='src/msw/dummy.cpp':@
# ADD CPP /Yc"wx/wxprec.h"
]@
@[if src.endswith('.c'):@
# SUBTRACT CPP /YX /Yc /Yu
]@
# End Source File
]@
# End Group
]@
# Begin Group "Headers"
# PROP Default_Filter ""
# Begin Group "Setup"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\msw\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
@[for group in HEADERS:@
# Begin Group "@group[0]"
# PROP Default_Filter ""
@[for hdr in group[1]:@
# Begin Source File
SOURCE=..\include\@hdr.replace('/','\\')
# End Source File
]@
# End Group
]@
# End Group
# End Target
# End Project

View File

@@ -1,231 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="BUILDING_LIB" overwrite="0">0</set>
<option name="SHARED">
<values>0,1</values>
<values-description>,DLL</values-description>
<default-value>0</default-value>
<description>
What type of library to build?
</description>
</option>
<option name="WXUNIV">
<values>0,1</values>
<values-description>,Universal</values-description>
<default-value>0</default-value>
<description>
Build wxUniversal instead of native port?
</description>
</option>
<option name="UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWindows?
</description>
</option>
<if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
<option name="MSLU">
<values>0,1</values>
<default-value>0</default-value>
<description>
Use MSLU library when building Unicode version.
</description>
</option>
</if>
<if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
<set var="MSLU">0</set>
</if>
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
<default-value>debug</default-value>
<description>
Type of compiled binaries
</description>
</option>
<option name="DEBUG_INFO">
<values>0,1,default</values>
<default-value>default</default-value>
<description>
Should debugging info be included in the executables? The default value
"default" means that debug info will be included if BUILD=debug
and not included if BUILD=release.
</description>
</option>
<option name="DEBUG_FLAG">
<values>0,1,default</values>
<default-value>default</default-value>
<description>
Should __WXDEBUG__ be defined? The default value "default" means that it will
be defined if BUILD=debug and not defined if BUILD=release.
</description>
</option>
<if cond="FORMAT=='msvc'">
<option name="DEBUG_RUNTIME_LIBS">
<values>0,1,default</values>
<default-value>default</default-value>
<description>
Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
Acts according to DEBUG_INFO by default.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="DEBUG_RUNTIME_LIBS">default</set>
</if>
<option name="MONOLITHIC">
<values>0,1</values>
<values-description>Multilib,Monolithic</values-description>
<default-value>0</default-value>
<description>
Multiple libraries or single huge monolithic one?
</description>
</option>
<option name="USE_GUI">
<values>0,1</values>
<values-description>Base,GUI</values-description>
<default-value>1</default-value>
<description>
Build GUI libraries?
</description>
</option>
<option name="USE_HTML">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxHTML library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_OPENGL">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build OpenGL canvas library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_ODBC">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build ODBC database classes (USE_GUI must be 1)?
</description>
</option>
<option name="OFFICIAL_BUILD">
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWindows developers?
</description>
</option>
<option name="VENDOR">
<default-value>custom</default-value>
<description>
Use this to name your customized DLLs differently
</description>
</option>
<option name="CFG">
<default-value></default-value>
<description>
Name of your custom configuration. This affects directory
where object files are stored as well as the location of
compiled .lib files and setup.h under the lib/ toplevel directory.
</description>
</option>
<!-- ================================================================== -->
<!-- Autoconf -->
<!-- ================================================================== -->
<if cond="FORMAT=='autoconf'">
<option name="DEREZ"/>
<option name="TOOLKIT"/>
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>
<option name="TOOLCHAIN_NAME"/>
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
<option name="HOST_SUFFIX"/>
<option name="SAMPLES_RPATH_FLAG"/>
<option name="SAMPLES_RPATH_POSTLINK"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
</if>
<!-- ================================================================== -->
<!-- Windows compilers -->
<!-- ================================================================== -->
<if cond="FORMAT!='autoconf'">
<option name="RUNTIME_LIBS">
<values>dynamic,static</values>
<default-value>dynamic</default-value>
<description>
Version of C runtime library to use. You can change this to
static if SHARED=0, but it is highly recommended to not do
it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT">MSW</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRACFLAGS"/>
<set var="SRCDIR">
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
</if>
<if cond="FORMAT=='mingw'">
<option name="GCC_VERSION">
<values>3,2.95</values>
<default-value>3</default-value>
<description>
Set the version of your Mingw installation here.
"3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
"2.95" ... for Mingw 1.1 or any of the older versions
</description>
</option>
<set var="GCCFLAGS">
<if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
</set>
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
</if>
</makefile>

View File

@@ -1,33 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_EXPAT"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_EXPAT">builtin</set>
</if>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
</set>
<lib id="wxexpat" template="3rdparty_lib"
cond="wxUSE_EXPAT=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
<include cond="FORMAT=='autoconf'">$(BUILDDIR)/src/expat</include>
<define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
COMPILED_FROM_DSP
</define>
<cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
<sources>
src/expat/lib/xmlparse.c
src/expat/lib/xmlrole.c
src/expat/lib/xmltok.c
</sources>
</lib>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -1,74 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBJPEG"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBJPEG">builtin</set>
</if>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
</set>
<lib id="wxjpeg" template="3rdparty_lib"
cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
<sources>
src/jpeg/jcomapi.c
src/jpeg/jutils.c
src/jpeg/jerror.c
src/jpeg/jmemmgr.c
src/jpeg/jmemnobs.c
src/jpeg/jcapimin.c
src/jpeg/jcapistd.c
src/jpeg/jctrans.c
src/jpeg/jcparam.c
src/jpeg/jdatadst.c
src/jpeg/jcinit.c
src/jpeg/jcmaster.c
src/jpeg/jcmarker.c
src/jpeg/jcmainct.c
src/jpeg/jcprepct.c
src/jpeg/jccoefct.c
src/jpeg/jccolor.c
src/jpeg/jcsample.c
src/jpeg/jchuff.c
src/jpeg/jcphuff.c
src/jpeg/jcdctmgr.c
src/jpeg/jfdctfst.c
src/jpeg/jfdctflt.c
src/jpeg/jfdctint.c
src/jpeg/jdapimin.c
src/jpeg/jdapistd.c
src/jpeg/jdtrans.c
src/jpeg/jdatasrc.c
src/jpeg/jdmaster.c
src/jpeg/jdinput.c
src/jpeg/jdmarker.c
src/jpeg/jdhuff.c
src/jpeg/jdphuff.c
src/jpeg/jdmainct.c
src/jpeg/jdcoefct.c
src/jpeg/jdpostct.c
src/jpeg/jddctmgr.c
src/jpeg/jidctfst.c
src/jpeg/jidctflt.c
src/jpeg/jidctint.c
src/jpeg/jidctred.c
src/jpeg/jdsample.c
src/jpeg/jdcolor.c
src/jpeg/jquant1.c
src/jpeg/jquant2.c
src/jpeg/jdmerge.c
</sources>
</lib>
</makefile>

View File

@@ -1,81 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Support for application bundles, for wxWindows samples.
-->
<!--
Nasty hack: use $(srcdir) to obtain usable CFBundleIdentifier suffix;
converts $(srcdir) like "../../samples/minimal" to "samples.minimal".
-->
<set var="BUNDLE_IDENTIFIER">
`echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`
</set>
<set var="BUNDLE_PLIST">
$(TOP_SRCDIR)src/mac/Info.plist.in
</set>
<set var="BUNDLE_RESOURCE">
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc
</set>
<set var="BUNDLE_ICONS">
$(TOP_SRCDIR)src/mac/wxmac.icns
</set>
<define-tag name="wx-mac-app-bundle" rules="exe">
<!-- bundle directory: -->
<set var="BUNDLE">$(id).app/Contents</set>
<set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
<add-target target="$(BUNDLE_TGT)" type="action"/>
<modify-target target="$(BUNDLE_TGT)">
<!-- required data: -->
<depends>$(id)</depends>
<depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
<depends-on-file>$(BUNDLE_RESOURCE)</depends-on-file>
<depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
<command>
<!-- create the directories: -->
mkdir -p $(BUNDLE)
mkdir -p $(BUNDLE)/MacOS
mkdir -p $(BUNDLE)/Resources
<!-- Info.plist: -->
sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \
-e "s/EXECUTABLE/$(id)/" \
-e "s/VERSION/$(WX_VERSION)/" \
$(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
<!-- PkgInfo: -->
echo -n "APPL????" >$(BUNDLE)/PkgInfo
<!-- make a hardlink to the binary: -->
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
<!-- ditto wxWindows resources and icons: -->
ln -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
ln -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
</command>
</modify-target>
<!-- add pseudo target id_bundle: -->
<add-target target="$(id)_bundle" type="phony"
cond="PLATFORM_MACOSX=='1'"/>
<modify-target target="$(id)_bundle">
<dependency-of>all</dependency-of>
<depends>$(BUNDLE_TGT)</depends>
</modify-target>
<!-- "make clean" should delete the bundle: -->
<modify-target target="clean">
<command>rm -rf $(id).app</command>
</modify-target>
</define-tag>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -1,31 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll>
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
</makefile>

View File

@@ -1,193 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
<dll id="basedll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</dll>
<lib id="baselib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
<!-- ================================================================= -->
<!-- wxNet library -->
<!-- ================================================================= -->
<dll id="netdll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_NET</define>
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="netlib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
<!-- ================================================================= -->
<!-- Main GUI library -->
<!-- ================================================================= -->
<dll id="coredll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="corelib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
<!-- ================================================================= -->
<!-- "Advanced" controls library -->
<!-- ================================================================= -->
<dll id="advdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ADV</define>
<sources>$(ADVANCED_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
<!-- DB classes library -->
<!-- ================================================================= -->
<dll id="odbcdll" template="wx_base_dll"
cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ODBC</define>
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
</dll>
<lib id="odbclib" template="wx_base_lib"
cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
</lib>
<dll id="dbgriddll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DBGRID</define>
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
<library>advdll</library>
<library>odbcdll</library>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="dbgridlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
<!-- ================================================================ -->
<!-- wxHTML -->
<!-- ================================================================ -->
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</dll>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
<!-- XML -->
<!-- ================================================================ -->
<dll id="xmldll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XML</define>
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
</dll>
<lib id="xmllib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
</makefile>

View File

@@ -1,42 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_ODBC"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_ODBC">
<if cond="PLATFORM_UNIX=='1'">builtin</if>
<if cond="PLATFORM_UNIX=='0'">0</if>
</set>
</if>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ODBC">
<if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>
</set>
<lib id="wxodbc" template="3rdparty_lib"
cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/iodbc/catalog.c
src/iodbc/connect.c
src/iodbc/dlf.c
src/iodbc/dlproc.c
src/iodbc/execute.c
src/iodbc/fetch.c
src/iodbc/hdbc.c
src/iodbc/henv.c
src/iodbc/herr.c
src/iodbc/hstmt.c
src/iodbc/info.c
src/iodbc/itrace.c
src/iodbc/misc.c
src/iodbc/prepare.c
src/iodbc/result.c
</sources>
</lib>
</makefile>

View File

@@ -1,48 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- OpenGL canvas library -->
<!-- ================================================================= -->
<set var="WXLIBGLDEP_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIBGLDEP_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<dll id="gldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GL</define>
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
<!-- link against base and core libs in multilib build: -->
<sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
<sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
<!-- link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<if cond="FORMAT=='autoconf'">
<ldflags>$(EXTRALIBS_OPENGL)</ldflags>
</if>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<if cond="COMPILER=='wat' or COMPILER=='gcc'">
<sys-lib>opengl32</sys-lib>
<sys-lib>glu32</sys-lib>
</if>
</if>
</dll>
<lib id="gllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
</lib>
</makefile>

View File

@@ -1,45 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBPNG"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBPNG">builtin</set>
</if>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
</set>
<lib id="wxpng" template="3rdparty_lib"
cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include>$(INC_ZLIB)</include>
<cflags-borland>-w-8004</cflags-borland>
<sources>
src/png/png.c
src/png/pngerror.c
src/png/pnggccrd.c
src/png/pngget.c
src/png/pngmem.c
src/png/pngpread.c
src/png/pngread.c
src/png/pngrio.c
src/png/pngrtran.c
src/png/pngrutil.c
src/png/pngset.c
src/png/pngtrans.c
src/png/pngvcrd.c
src/png/pngwio.c
src/png/pngwrite.c
src/png/pngwtran.c
src/png/pngwutil.c
</sources>
</lib>
</makefile>

View File

@@ -1,248 +0,0 @@
#!/usr/bin/env python
#
# Generates Makefile that is used to regenerate native makefiles from
# bakefiles.
#
# $Id$
#
import string, os.path, copy
# list of files that should _not_ be generated even thought we could do it:
DONT_GENERATE = [
'../../samples/Makefile.in',
'../../samples/samples.dsw',
'../../demos/demos.dsw',
'../../samples/html/html_samples.dsw',
'../../samples/opengl/opengl_samples.dsw',
'../../samples/mobile/mobile_samples.dsw',
'../../utils/utils.dsw',
]
file = open('Makefile', 'wt')
file.write("""
# Generated by regenMakefile.py
BAKEFILE = bakefile -v
CDEPS = config.bkl common.bkl common_contrib.bkl
SDEPS = config.bkl common.bkl common_samples.bkl
MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
-DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
-DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
COMPAT_TARGETS = ../../src/wxWindows.dsp
""")
lines = {}
all = {}
all['autoconf'] = []
linesCur = None
def addMakefile(bake, makedirs, deps=[], args={}):
"""Adds rules to regenerate native makefile in directory 'makedir' from
bakefiles 'bake'. 'deps' contains additional dependencies (bakefiles
other than 'bake'."""
print 'adding %s...' % bake
global linesCur
linesCur = ['\n']
def add(bake, makedirs, make, dep, format, args={}):
global linesCur
a = ''
if 'all' in args: a += ' %s' % args['all']
if format in args: a += ' %s' % args[format]
if format != 'autoconf' and 'not_autoconf' in args:
a += ' %s' % args['not_autoconf']
if format in makedirs:
makedir = makedirs[format]
else:
makedir = makedirs['all']
tfile = '%s/%s' % (makedir, make)
if tfile in DONT_GENERATE: return
linesCur.append('%s: %s' % (tfile, dep))
linesCur.append('\t$(BAKEFILE) -f%s -o$@ %s %s' % (format, a, bake))
linesCur.append('\ttouch $@')
if format not in all: all[format] = []
all[format].append(tfile)
dep = string.join(deps + [bake], ' ')
add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)
add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)
add(bake, makedirs, 'makefile.vc', dep, 'msvc', args)
add(bake, makedirs, 'makefile.gcc', dep, 'mingw', args)
add(bake, makedirs, 'makefile.wat', dep, 'watcom', args)
add(bake, makedirs,
(bake[1+bake.rfind('/'):]).replace('.bkl','.dsw'),
dep, 'msvc6prj', args)
lines[bake] = linesCur
# -----------------------------------------------
# Add the makefiles:
# -----------------------------------------------
# main makefile:
addMakefile('wx.bkl', {'all':'../msw','autoconf':'../..'}, [ '$(MDEPS)' ],
args={
'borland':'-DOPTIONS_FILE=config.bcc',
'msvc':'-DOPTIONS_FILE=config.vc',
'mingw':'-DOPTIONS_FILE=config.gcc',
'watcom':'-DOPTIONS_FILE=config.wat',
'msvc6prj':'$(DSWFLAGS)',
})
# samples main makefile:
addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
args={
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
})
addMakefile('../../demos/demos.bkl', {'all':'../../demos'},
args={
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
})
addMakefile('../../utils/utils.bkl', {'all':'../../utils'},
args={
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
})
CONTRIB_DIR = 1
SAMPLES_DIR = 2
def onSubmakefile(type, dirname, names):
bakes = [x for x in names if x.endswith('.bkl')]
if len(bakes) == 0: return
bakes.sort()
dirname = dirname.replace(os.sep, '/')
depth = dirname.count('/') - 2
if depth <= 0: return
if type==SAMPLES_DIR:
prefix = ''.join(['../' for i in range(0,depth)])
topdirflags = '-DWXTOPDIR=%s../' % prefix
srcdirflags = ''
cfgbase = '%s../build/msw/config.' % prefix
elif type==CONTRIB_DIR:
srcdirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
topdirflags = ' -DWXTOPDIR=../../../'
cfgbase = '../../../build/msw/config.'
args = {
'all':topdirflags,
'not_autoconf':srcdirflags,
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',
'borland':'-DOPTIONS_FILE='+cfgbase+'bcc -DWRITE_OPTIONS_FILE=0',
'watcom':'-DOPTIONS_FILE='+cfgbase+'wat -DWRITE_OPTIONS_FILE=0',
'msvc6prj':'$(DSWFLAGS)',
}
for bake in bakes:
if type==CONTRIB_DIR:
acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
ruledep = '$(CDEPS)'
else:
acdir = dirname
ruledep = '$(SDEPS)'
addMakefile('%s/%s' % (dirname, bake),
{'all':dirname,'autoconf':acdir}, deps=[ruledep],
args=args)
os.path.walk(os.path.join('..','..','samples'),
onSubmakefile, SAMPLES_DIR)
os.path.walk(os.path.join('..','..','demos'),
onSubmakefile, SAMPLES_DIR)
os.path.walk(os.path.join('..','..','utils'),
onSubmakefile, SAMPLES_DIR)
os.path.walk(os.path.join('..','..','contrib','build'),
onSubmakefile, CONTRIB_DIR)
os.path.walk(os.path.join('..','..','contrib','samples'),
onSubmakefile, SAMPLES_DIR)
os.path.walk(os.path.join('..','..','contrib','utils'),
onSubmakefile, SAMPLES_DIR)
cleanCmds = ''
allK = all.keys()
allK.sort()
cleanList = []
for f in allK:
all[f].sort()
for f in allK:
for i in all[f]:
cleanList.append('\trm -f %s\n' % i)
cleanCmds = ''.join(cleanList)
for f in allK:
var = '%s_ALL' % f.upper()
file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f])))
file.write('\nall: $(COMPAT_TARGETS)')
for f in allK:
file.write(' %s' % f)
file.write('\n\n')
for f in allK:
file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
file.write("""
clean:
\trm -f ../../autoconf_inc.m4
\trm -f $(COMPAT_TARGETS)
%s
library: ../../Makefile.in\\
../msw/makefile.bcc\\
../msw/makefile.vc\\
../msw/makefile.wat\\
../msw/makefile.gcc\\
../msw/wx.dsw\\
../../src/wxWindows.dsp
../../autoconf_inc.m4: ../../Makefile.in
../../src/wxWindows.dsp: monolithic.bkl files.bkl
\t$(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl
\ttouch $@
Makefile: regenMakefile.py
\t./regenMakefile.py
\t@echo
\t@echo -------------------------------------------
\t@echo Please rerun make, Makefile was regenerated
\t@echo -------------------------------------------
\t@echo
\t@exit 1
""" % cleanCmds)
linesK = lines.keys()
linesK.sort()
for lk in linesK:
for l in lines[lk]:
file.write('%s\n' % l)
file.close()

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">builtin</set>
</if>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8066</cflags-borland>
<sources>
src/regex/regcomp.c
src/regex/regexec.c
src/regex/regerror.c
src/regex/regfree.c
</sources>
</lib>
</makefile>

View File

@@ -1,66 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBTIFF"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBTIFF">builtin</set>
</if>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
</set>
<set var="TIFF_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
</set>
<lib id="wxtiff" template="3rdparty_lib"
cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<sources>
$(TIFF_PLATFORM_SRC)
src/tiff/tif_aux.c
src/tiff/tif_close.c
src/tiff/tif_codec.c
src/tiff/tif_compress.c
src/tiff/tif_dir.c
src/tiff/tif_dirinfo.c
src/tiff/tif_dirread.c
src/tiff/tif_dirwrite.c
src/tiff/tif_dumpmode.c
src/tiff/tif_error.c
src/tiff/tif_fax3.c
src/tiff/tif_fax3sm.c
src/tiff/tif_getimage.c
src/tiff/tif_jpeg.c
src/tiff/tif_flush.c
src/tiff/tif_lzw.c
src/tiff/tif_luv.c
src/tiff/tif_next.c
src/tiff/tif_open.c
src/tiff/tif_packbits.c
src/tiff/tif_pixarlog.c
src/tiff/tif_predict.c
src/tiff/tif_print.c
src/tiff/tif_read.c
src/tiff/tif_swab.c
src/tiff/tif_strip.c
src/tiff/tif_thunder.c
src/tiff/tif_tile.c
src/tiff/tif_version.c
src/tiff/tif_warning.c
src/tiff/tif_write.c
src/tiff/tif_zip.c
</sources>
</lib>
</makefile>

View File

@@ -1,191 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!-- Master bakefile for wxWindows -->
<makefile>
<!-- make sure setup.h is created as soon as possible: -->
<phony id="setup_h" cond="FORMAT!='autoconf'">
<dependency-of>all</dependency-of>
</phony>
<set var="BUILDING_LIB">1</set>
<!-- common rules, names etc. for wx: -->
<include file="common.bkl"/>
<!-- list of files sorted into categories: -->
<include file="files.bkl"/>
<!-- wxWindows variant where everything is in one library: -->
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
<!-- OpenGL canvas is built as separate library in both cases: -->
<include file="opengl.bkl"/>
<!-- Samples target (not dependency of 'all'): -->
<subproject id="samples">
<installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir>
<dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
</subproject>
<if cond="FORMAT=='autoconf'">
<!-- "make install": -->
<data-files>
<files>wxwin.m4</files>
<install-to>$(DATADIR)/aclocal</install-to>
</data-files>
<data-files-tg id="install-afm" cond="USE_GUI=='1'">
<files>misc/afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/afm</install-to>
</data-files-tg>
<data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
<files>misc/gs_afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/gs_afm</install-to>
</data-files-tg>
<action id="install-wxconfig">
<dependency-of>install</dependency-of>
<command>
$(INSTALL_DIR) $(BINDIR)
$(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(BINDIR)
(cd $(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
</command>
</action>
<data-files>
<srcdir>$(BUILDDIR)</srcdir>
<files>lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h</files>
<install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_NAME)/wx</install-to>
</data-files>
<headers>
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
</headers>
<!-- Locales: -->
<using module="gettext"/>
<gettext-catalogs id="locale">
<srcdir>$(SRCDIR)/locale</srcdir>
<catalog-name>wxstd</catalog-name>
<linguas>
ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
zh zh_CN zh_TW
</linguas>
<install-to>$(LOCALEDIR)</install-to>
</gettext-catalogs>
<!-- Mac OS X resources: -->
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
<set var="MACOS_RSRC">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc</set>
<action id="macos-res" cond="TOOLKIT=='MAC'">
<dependency-of>all</dependency-of>
<set var="__targetname">$(MACOS_R)</set>
<command>
$(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)
$(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
</command>
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
</action>
<action id="macos-res-install" cond="TOOLKIT=='MAC'">
<dependency-of>install</dependency-of>
<depends>macos-res</depends>
<command>
$(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
$(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
</command>
</action>
<action id="cocoa-res" cond="TOOLKIT=='COCOA'">
<dependency-of>all</dependency-of>
<set var="__targetname">$(MACOS_R)</set>
<command>
$(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
</command>
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
</action>
<action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
<dependency-of>install</dependency-of>
<depends>macos-res</depends>
<command>
$(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
$(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
</command>
</action>
</if>
<!-- copy setup.h on Windows: -->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir>
</mkdir>
<mkdir id="libdir_setup">
<depends>libdir</depends>
<dir>$(SETUPHDIR)</dir>
</mkdir>
<mkdir id="libdir_setup_wx">
<depends>libdir_setup</depends>
<dependency-of>setup_h</dependency-of>
<dir>$(SETUPHDIR)/wx</dir>
</mkdir>
<set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if>
<if cond="WXUNIV=='0'">msw</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
<dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
<dependency-of>setup_h</dependency-of>
</copy-file-to-file-if-not-exist>
<copy-file-to-file-if-not-exist id="setup.h">
<dependency-of>setup_h</dependency-of>
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
<dst>$(SETUPHDIR)/wx/setup.h</dst>
</copy-file-to-file-if-not-exist>
</if>
<if cond="FORMAT=='autoconf'">
<!-- Show this banner after installation: -->
<modify-target target="install">
<command>
@echo " "
@echo " ------------------------------------------------------"
@echo " "
@echo " The installation of wxWindows is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@echo " if you installed a shared library and also modify the"
@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
@echo " "
@echo " wxWindows comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
@echo " Read the wxWindows Licence on licencing conditions."
@echo " "
@echo " ------------------------------------------------------"
@echo " "
</command>
</modify-target>
<!-- add "make dist" target to autoconf: -->
<set var="VARS_DONT_ELIMINATE" append="1">
ALL_BASE_SOURCES WX_VERSION
</set>
<fragment format="autoconf" file="make_dist.mk"/>
</if>
</makefile>

View File

@@ -1,147 +0,0 @@
#
# Helper functions for wxWindows bakefiles
#
# $Id$
#
import utils
# We use 'CFG' option in places where bakefile doesn't like it, so we must
# register a substitution function for it that provides additional knowledge
# about the option (in this case that it does not contain dir separators and
# so utils.nativePaths() doesn't have to do anything with it):
def __noopSubst(func, name):
return '$(%s)' % name
utils.addSubstituteCallback('CFG', __noopSubst)
utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
utils.addSubstituteCallback('OBJS', __noopSubst)
def mk_wxid(id):
"""Creates wxWindows library identifier from bakefile target ID that
follows this convention: DLLs end with 'dll', static libraries
end with 'lib'. If withPrefix=1, then _wxid is returned instead
of wxid."""
if id.endswith('dll') or id.endswith('lib'):
wxid = id[:-3]
else:
wxid = id
return wxid
# All libs that are part of the main library (i.e. non-contrib):
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
'odbc', 'dbgrid']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net', 'odbc']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid']
def mkLibName(wxid):
"""Returns string that can be used as library name, including name
suffixes, prefixes, version tags etc. This must be kept in sync
with variables defined in common.bkl!"""
if wxid == 'mono':
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)$(HOST_SUFFIX)'
if wxid == 'base':
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)$(WXVERSIONTAG)$(HOST_SUFFIX)'
if wxid in LIBS_NOGUI:
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)$(HOST_SUFFIX)' % wxid
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)$(HOST_SUFFIX)' % wxid
def mkDllName(wxid):
"""Returns string that can be used as DLL name, including name
suffixes, prefixes, version tags etc. This must be kept in sync
with variables defined in common.bkl!"""
if wxid == 'mono':
return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
if wxid == 'base':
return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
if wxid in LIBS_NOGUI:
return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
def libToLink(wxlibname):
"""Returns string to pass to <sys-lib> when linking against 'wxlibname'.
For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which
must be defined in common.bkl as either nothing (in monolithic build) or
mkLibName('foo') (otherwise).
For contrib libraries, it returns mkDllName(wxlibname).
"""
if wxlibname in MAIN_LIBS:
return '$(WXLIB_%s)' % wxlibname.upper()
else:
return mkLibName(wxlibname)
wxVersion = None
VERSION_FILE = '../../include/wx/version.h'
def getVersion():
"""Returns wxWindows version as a tuple: (major,minor,release)."""
global wxVersion
if wxVersion == None:
f = open(VERSION_FILE, 'rt')
lines = f.readlines()
f.close()
major = minor = release = None
for l in lines:
if not l.startswith('#define'): continue
splitted = l.strip().split()
if splitted[0] != '#define': continue
if len(splitted) < 3: continue
name = splitted[1]
value = splitted[2]
if value == None: continue
if name == 'wxMAJOR_VERSION': major = int(value)
if name == 'wxMINOR_VERSION': minor = int(value)
if name == 'wxRELEASE_NUMBER': release = int(value)
if major != None and minor != None and release != None:
break
wxVersion = (major, minor, release)
return wxVersion
def getVersionMajor():
return getVersion()[0]
def getVersionMinor():
return getVersion()[1]
def getVersionRelease():
return getVersion()[2]
def headersOnly(files):
"""Filters 'files' so that only headers are left. Used with
<msvc-project-files> to add headers to VC++ projects but not files such
as arrimpl.cpp."""
def callback(cond, sources):
prf = suf = ''
if sources[0].isspace(): prefix=' '
if sources[-1].isspace(): suffix=' '
retval = []
for s in sources.split():
if s.endswith('.h'):
retval.append(s)
return '%s%s%s' % (prf, ' '.join(retval), suf)
return utils.substitute2(files, callback)
def makeDspDependency(lib):
"""Returns suitable entry for <depends-on-dsp> for main libs."""
DEPS_TABLE = {
'core':'base',
'adv':'core',
'html':'core',
'xml':'base',
'net':'base',
'odbc':'base',
'dbgrid':'adv,odbc',
}
if lib in DEPS_TABLE:
deps = ':%s' % DEPS_TABLE[lib]
else:
deps = ''
return '%s:$(nativePaths(WXTOPDIR))build\msw\wx_%s.dsp%s' % (lib,lib,deps)

View File

@@ -1,39 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_ZLIB"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_ZLIB">builtin</set>
</if>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>
</set>
<lib id="wxzlib" template="3rdparty_lib"
cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8004 -w-8012 -w-8057</cflags-borland>
<sources>
src/zlib/adler32.c
src/zlib/compress.c
src/zlib/crc32.c
src/zlib/gzio.c
src/zlib/uncompr.c
src/zlib/deflate.c
src/zlib/trees.c
src/zlib/zutil.c
src/zlib/inflate.c
src/zlib/infblock.c
src/zlib/inftrees.c
src/zlib/infcodes.c
src/zlib/infutil.c
src/zlib/inffast.c
</sources>
</lib>
</makefile>

View File

@@ -1,128 +0,0 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# Type of compiled binaries [debug,release]
!ifndef BUILD
BUILD = debug
!endif
# C compiler
!ifndef CC
CC = bcc32
!endif
# Name of your custom configuration. This affects directory
# where object files are stored as well as the location of
# compiled .lib files and setup.h under the lib/ toplevel directory.
!ifndef CFG
CFG =
!endif
# Standard flags for CC
!ifndef CFLAGS
CFLAGS =
!endif
# Standard preprocessor flags (common for CC and CXX)
!ifndef CPPFLAGS
CPPFLAGS = -a8 -g0
!endif
# C++ compiler
!ifndef CXX
CXX = bcc32
!endif
# Standard flags for C++
!ifndef CXXFLAGS
CXXFLAGS =
!endif
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
!ifndef DEBUG_FLAG
DEBUG_FLAG = default
!endif
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
!ifndef DEBUG_INFO
DEBUG_INFO = default
!endif
# Standard linker flags
!ifndef LDFLAGS
LDFLAGS =
!endif
# Multiple libraries or single huge monolithic one? [0,1]
!ifndef MONOLITHIC
MONOLITHIC = 0
!endif
# Use MSLU library when building Unicode version. [0,1]
!ifndef MSLU
MSLU = 0
!endif
# Is this official build by wxWindows developers? [0,1]
!ifndef OFFICIAL_BUILD
OFFICIAL_BUILD = 0
!endif
# Version of C runtime library to use. You can change this to
# static if SHARED=0, but it is highly recommended to not do
# it if SHARED=1 unless you know what you are doing. [dynamic,static]
!ifndef RUNTIME_LIBS
RUNTIME_LIBS = dynamic
!endif
# What type of library to build? [0,1]
!ifndef SHARED
SHARED = 0
!endif
# Compile Unicode build of wxWindows? [0,1]
!ifndef UNICODE
UNICODE = 0
!endif
# Build GUI libraries? [0,1]
!ifndef USE_GUI
USE_GUI = 1
!endif
# Build wxHTML library (USE_GUI must be 1)? [0,1]
!ifndef USE_HTML
USE_HTML = 1
!endif
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
!ifndef USE_ODBC
USE_ODBC = 0
!endif
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
!ifndef USE_OPENGL
USE_OPENGL = 0
!endif
# Use this to name your customized DLLs differently
!ifndef VENDOR
VENDOR = custom
!endif
# Build wxUniversal instead of native port? [0,1]
!ifndef WXUNIV
WXUNIV = 0
!endif

View File

@@ -1,84 +0,0 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# Type of compiled binaries [debug,release]
BUILD = debug
# C compiler
CC = gcc
# Name of your custom configuration. This affects directory
# where object files are stored as well as the location of
# compiled .lib files and setup.h under the lib/ toplevel directory.
CFG =
# Standard flags for CC
CFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# C++ compiler
CXX = g++
# Standard flags for C++
CXXFLAGS =
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
DEBUG_FLAG = default
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
DEBUG_INFO = default
# Set the version of your Mingw installation here.
# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
GCC_VERSION = 3
# Standard linker flags
LDFLAGS =
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 0
# Use MSLU library when building Unicode version. [0,1]
MSLU = 0
# Is this official build by wxWindows developers? [0,1]
OFFICIAL_BUILD = 0
# What type of library to build? [0,1]
SHARED = 0
# Compile Unicode build of wxWindows? [0,1]
UNICODE = 0
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0

View File

@@ -1,88 +0,0 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# Type of compiled binaries [debug,release]
BUILD = debug
# C compiler
CC = cl
# Name of your custom configuration. This affects directory
# where object files are stored as well as the location of
# compiled .lib files and setup.h under the lib/ toplevel directory.
CFG =
# Standard flags for CC
CFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# C++ compiler
CXX = cl
# Standard flags for C++
CXXFLAGS =
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
DEBUG_FLAG = default
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
DEBUG_INFO = default
# Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
# Acts according to DEBUG_INFO by default. [0,1,default]
DEBUG_RUNTIME_LIBS = default
# Standard linker flags
LDFLAGS =
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 0
# Use MSLU library when building Unicode version. [0,1]
MSLU = 0
# Is this official build by wxWindows developers? [0,1]
OFFICIAL_BUILD = 0
# Version of C runtime library to use. You can change this to
# static if SHARED=0, but it is highly recommended to not do
# it if SHARED=1 unless you know what you are doing. [dynamic,static]
RUNTIME_LIBS = dynamic
# What type of library to build? [0,1]
SHARED = 0
# Compile Unicode build of wxWindows? [0,1]
UNICODE = 0
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0

View File

@@ -1,81 +0,0 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# Type of compiled binaries [debug,release]
BUILD = debug
# C compiler
CC = wcc386
# Name of your custom configuration. This affects directory
# where object files are stored as well as the location of
# compiled .lib files and setup.h under the lib/ toplevel directory.
CFG =
# Standard flags for CC
CFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# C++ compiler
CXX = wpp386
# Standard flags for C++
CXXFLAGS =
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
DEBUG_FLAG = default
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
DEBUG_INFO = default
# Standard linker flags
LDFLAGS =
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 0
# Is this official build by wxWindows developers? [0,1]
OFFICIAL_BUILD = 0
# Version of C runtime library to use. You can change this to
# static if SHARED=0, but it is highly recommended to not do
# it if SHARED=1 unless you know what you are doing. [dynamic,static]
RUNTIME_LIBS = dynamic
# What type of library to build? [0,1]
SHARED = 0
# Compile Unicode build of wxWindows? [0,1]
UNICODE = 0
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,184 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "adv"=wx_adv.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "base"=wx_base.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "core"=wx_core.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "gl"=wx_gl.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "html"=wx_html.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "net"=wx_net.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxexpat"=wx_wxexpat.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxjpeg"=wx_wxjpeg.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxpng"=wx_wxpng.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxregex"=wx_wxregex.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxtiff"=wx_wxtiff.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxzlib"=wx_wxzlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "xml"=wx_xml.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@@ -1,805 +0,0 @@
# Microsoft Developer Studio Project File - Name="adv" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=adv - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_adv.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_adv.mak" CFG="adv - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "adv - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "adv - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw250_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw250_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug
!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\adv"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib"
!ENDIF
# Begin Target
# Name "adv - Win32 Debug"
# Name "adv - Win32 Release"
# Name "adv - Win32 Unicode Debug"
# Name "adv - Win32 Unicode Release"
# Name "adv - Win32 Universal Debug"
# Name "adv - Win32 Universal Release"
# Name "adv - Win32 Universal Unicode Debug"
# Name "adv - Win32 Universal Unicode Release"
# Name "adv - Win32 DLL Debug"
# Name "adv - Win32 DLL Release"
# Name "adv - Win32 DLL Unicode Debug"
# Name "adv - Win32 DLL Unicode Release"
# Name "adv - Win32 DLL Universal Debug"
# Name "adv - Win32 DLL Universal Release"
# Name "adv - Win32 DLL Universal Unicode Debug"
# Name "adv - Win32 DLL Universal Unicode Release"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\taskbarcmn.cpp
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\joystick.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\taskbar.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\wave.cpp
# End Source File
# End Group
# Begin Group "Generic Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\generic\calctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\dcbuffer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\grid.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\gridctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\gridsel.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\helpext.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\laywin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\sashwin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\splash.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\tipdlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\wizard.cpp
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "adv - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\joystick.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\taskbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\wave.h
# End Source File
# End Group
# Begin Group "Generic Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\generic\calctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\grid.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\gridctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\gridsel.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\helpext.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\laywin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\sashwin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\splash.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\wizard.h
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\calctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dcbuffer.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\grid.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\joystick.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\laywin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\sashwin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\splash.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\taskbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\tipdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wave.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wizard.h
# End Source File
# End Group
# End Target
# End Project

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,649 +0,0 @@
# Microsoft Developer Studio Project File - Name="dbgrid" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=dbgrid - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_dbgrid.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_dbgrid.mak" CFG="dbgrid - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "dbgrid - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "dbgrid - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw250_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw250_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib"
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\dbgrid"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\dbgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib"
!ENDIF
# Begin Target
# Name "dbgrid - Win32 Debug"
# Name "dbgrid - Win32 Release"
# Name "dbgrid - Win32 Unicode Debug"
# Name "dbgrid - Win32 Unicode Release"
# Name "dbgrid - Win32 Universal Debug"
# Name "dbgrid - Win32 Universal Release"
# Name "dbgrid - Win32 Universal Unicode Debug"
# Name "dbgrid - Win32 Universal Unicode Release"
# Name "dbgrid - Win32 DLL Debug"
# Name "dbgrid - Win32 DLL Release"
# Name "dbgrid - Win32 DLL Unicode Debug"
# Name "dbgrid - Win32 DLL Unicode Release"
# Name "dbgrid - Win32 DLL Universal Debug"
# Name "dbgrid - Win32 DLL Universal Release"
# Name "dbgrid - Win32 DLL Universal Unicode Debug"
# Name "dbgrid - Win32 DLL Universal Unicode Release"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\dbgrid.cpp
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "dbgrid - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\dbgrid.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,302 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "adv"=.\wx_adv.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name core
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
}}}
###############################################################################
Project: "base"=.\wx_base.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
}}}
###############################################################################
Project: "core"=.\wx_core.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
}}}
###############################################################################
Project: "dbgrid"=.\wx_dbgrid.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name adv
End Project Dependency
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name core
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
}}}
###############################################################################
Project: "gl"=.\wx_gl.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name core
End Project Dependency
}}}
###############################################################################
Project: "html"=.\wx_html.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name core
End Project Dependency
}}}
###############################################################################
Project: "net"=.\wx_net.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
}}}
###############################################################################
Project: "odbc"=.\wx_odbc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
}}}
###############################################################################
Project: "wxexpat"=.\wx_wxexpat.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxjpeg"=.\wx_wxjpeg.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxpng"=.\wx_wxpng.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxregex"=.\wx_wxregex.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxtiff"=.\wx_wxtiff.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxzlib"=.\wx_wxzlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "xml"=.\wx_xml.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@@ -1,645 +0,0 @@
# Microsoft Developer Studio Project File - Name="gl" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=gl - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_gl.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_gl.mak" CFG="gl - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gl - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "gl - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw250_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw250_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib"
!ENDIF
# Begin Target
# Name "gl - Win32 Debug"
# Name "gl - Win32 Release"
# Name "gl - Win32 Unicode Debug"
# Name "gl - Win32 Unicode Release"
# Name "gl - Win32 Universal Debug"
# Name "gl - Win32 Universal Release"
# Name "gl - Win32 Universal Unicode Debug"
# Name "gl - Win32 Universal Unicode Release"
# Name "gl - Win32 DLL Debug"
# Name "gl - Win32 DLL Release"
# Name "gl - Win32 DLL Unicode Debug"
# Name "gl - Win32 DLL Unicode Release"
# Name "gl - Win32 DLL Universal Debug"
# Name "gl - Win32 DLL Universal Release"
# Name "gl - Win32 DLL Universal Unicode Debug"
# Name "gl - Win32 DLL Universal Unicode Release"
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\glcanvas.cpp
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "gl - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\glcanvas.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,801 +0,0 @@
# Microsoft Developer Studio Project File - Name="html" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=html - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_html.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_html.mak" CFG="html - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "html - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "html - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug
!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw250_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw250_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw250ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug
!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw250u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib"
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv250ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\html"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv250u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv250u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib"
!ENDIF
# Begin Target
# Name "html - Win32 Debug"
# Name "html - Win32 Release"
# Name "html - Win32 Unicode Debug"
# Name "html - Win32 Unicode Release"
# Name "html - Win32 Universal Debug"
# Name "html - Win32 Universal Release"
# Name "html - Win32 Universal Unicode Debug"
# Name "html - Win32 Universal Unicode Release"
# Name "html - Win32 DLL Debug"
# Name "html - Win32 DLL Release"
# Name "html - Win32 DLL Unicode Debug"
# Name "html - Win32 DLL Unicode Release"
# Name "html - Win32 DLL Universal Debug"
# Name "html - Win32 DLL Universal Release"
# Name "html - Win32 DLL Universal Unicode Debug"
# Name "html - Win32 DLL Universal Unicode Release"
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\helpbest.cpp
# End Source File
# End Group
# Begin Group "Generic Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\generic\htmllbox.cpp
# End Source File
# End Group
# Begin Group "wxHTML Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\html\helpctrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\helpdata.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\helpfrm.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmlcell.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmlfilt.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmlpars.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmltag.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmlwin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\htmprint.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_dflist.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_fonts.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_hline.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_image.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_layout.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_links.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_list.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_pre.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_style.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\m_tables.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\winpars.cpp
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "html - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "wxHTML Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\html\forcelnk.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpdata.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpfrm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlcell.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmldefs.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlfilt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlpars.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlproc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmltag.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlwin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmprint.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\m_templ.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\winpars.h
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\htmllbox.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wxhtml.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,738 +0,0 @@
# Microsoft Developer Studio Project File - Name="net" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=net - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_net.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_net.mak" CFG="net - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "net - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "net - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug
!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug
!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib"
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\net"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib"
!ENDIF
# Begin Target
# Name "net - Win32 Debug"
# Name "net - Win32 Release"
# Name "net - Win32 Unicode Debug"
# Name "net - Win32 Unicode Release"
# Name "net - Win32 Universal Debug"
# Name "net - Win32 Universal Release"
# Name "net - Win32 Universal Unicode Debug"
# Name "net - Win32 Universal Unicode Release"
# Name "net - Win32 DLL Debug"
# Name "net - Win32 DLL Release"
# Name "net - Win32 DLL Unicode Debug"
# Name "net - Win32 DLL Unicode Release"
# Name "net - Win32 DLL Universal Debug"
# Name "net - Win32 DLL Universal Release"
# Name "net - Win32 DLL Universal Unicode Debug"
# Name "net - Win32 DLL Universal Unicode Release"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\fs_inet.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\ftp.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\http.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\protocol.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\sckaddr.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\sckfile.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\sckipc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\sckstrm.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\socket.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\url.cpp
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\gsocket.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "net - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\gsockmsw.h
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\protocol\file.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\fs_inet.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\protocol\ftp.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\gsocket.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\protocol\http.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\protocol\protocol.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\sckaddr.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\sckipc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\sckstrm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\socket.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\url.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,661 +0,0 @@
# Microsoft Developer Studio Project File - Name="odbc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=odbc - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_odbc.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_odbc.mak" CFG="odbc - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "odbc - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "odbc - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib"
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\odbc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\odbc"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib"
!ENDIF
# Begin Target
# Name "odbc - Win32 Debug"
# Name "odbc - Win32 Release"
# Name "odbc - Win32 Unicode Debug"
# Name "odbc - Win32 Unicode Release"
# Name "odbc - Win32 Universal Debug"
# Name "odbc - Win32 Universal Release"
# Name "odbc - Win32 Universal Unicode Debug"
# Name "odbc - Win32 Universal Unicode Release"
# Name "odbc - Win32 DLL Debug"
# Name "odbc - Win32 DLL Release"
# Name "odbc - Win32 DLL Unicode Debug"
# Name "odbc - Win32 DLL Unicode Release"
# Name "odbc - Win32 DLL Universal Debug"
# Name "odbc - Win32 DLL Universal Release"
# Name "odbc - Win32 DLL Universal Unicode Debug"
# Name "odbc - Win32 DLL Universal Unicode Release"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\db.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dbtable.cpp
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "odbc - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\db.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dbkeyg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dbtable.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,451 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxexpat" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxexpat - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxexpat.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxexpat - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxexpat - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxexpat"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
!ENDIF
# Begin Target
# Name "wxexpat - Win32 Debug"
# Name "wxexpat - Win32 Release"
# Name "wxexpat - Win32 Unicode Debug"
# Name "wxexpat - Win32 Unicode Release"
# Name "wxexpat - Win32 Universal Debug"
# Name "wxexpat - Win32 Universal Release"
# Name "wxexpat - Win32 Universal Unicode Debug"
# Name "wxexpat - Win32 Universal Unicode Release"
# Name "wxexpat - Win32 DLL Debug"
# Name "wxexpat - Win32 DLL Release"
# Name "wxexpat - Win32 DLL Unicode Debug"
# Name "wxexpat - Win32 DLL Unicode Release"
# Name "wxexpat - Win32 DLL Universal Debug"
# Name "wxexpat - Win32 DLL Universal Release"
# Name "wxexpat - Win32 DLL Universal Unicode Debug"
# Name "wxexpat - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\expat\lib\xmlparse.c
# End Source File
# Begin Source File
SOURCE=..\..\src\expat\lib\xmlrole.c
# End Source File
# Begin Source File
SOURCE=..\..\src\expat\lib\xmltok.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,623 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxjpeg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxjpeg - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxjpeg.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxjpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxjpeg - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
!ENDIF
# Begin Target
# Name "wxjpeg - Win32 Debug"
# Name "wxjpeg - Win32 Release"
# Name "wxjpeg - Win32 Unicode Debug"
# Name "wxjpeg - Win32 Unicode Release"
# Name "wxjpeg - Win32 Universal Debug"
# Name "wxjpeg - Win32 Universal Release"
# Name "wxjpeg - Win32 Universal Unicode Debug"
# Name "wxjpeg - Win32 Universal Unicode Release"
# Name "wxjpeg - Win32 DLL Debug"
# Name "wxjpeg - Win32 DLL Release"
# Name "wxjpeg - Win32 DLL Unicode Debug"
# Name "wxjpeg - Win32 DLL Unicode Release"
# Name "wxjpeg - Win32 DLL Universal Debug"
# Name "wxjpeg - Win32 DLL Universal Release"
# Name "wxjpeg - Win32 DLL Universal Unicode Debug"
# Name "wxjpeg - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\jpeg\jcapimin.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcapistd.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jccoefct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jccolor.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcdctmgr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jchuff.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcinit.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcmainct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcmarker.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcmaster.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcomapi.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcparam.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcphuff.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcprepct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jcsample.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jctrans.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdapimin.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdapistd.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdatadst.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdatasrc.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdcoefct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdcolor.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jddctmgr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdhuff.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdinput.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdmainct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdmarker.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdmaster.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdmerge.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdphuff.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdpostct.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdsample.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jdtrans.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jerror.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jfdctflt.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jfdctfst.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jfdctint.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jidctflt.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jidctfst.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jidctint.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jidctred.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jmemmgr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jmemnobs.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jquant1.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jquant2.c
# End Source File
# Begin Source File
SOURCE=..\..\src\jpeg\jutils.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,507 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxpng" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxpng - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxpng.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxpng - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxpng"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
!ENDIF
# Begin Target
# Name "wxpng - Win32 Debug"
# Name "wxpng - Win32 Release"
# Name "wxpng - Win32 Unicode Debug"
# Name "wxpng - Win32 Unicode Release"
# Name "wxpng - Win32 Universal Debug"
# Name "wxpng - Win32 Universal Release"
# Name "wxpng - Win32 Universal Unicode Debug"
# Name "wxpng - Win32 Universal Unicode Release"
# Name "wxpng - Win32 DLL Debug"
# Name "wxpng - Win32 DLL Release"
# Name "wxpng - Win32 DLL Unicode Debug"
# Name "wxpng - Win32 DLL Unicode Release"
# Name "wxpng - Win32 DLL Universal Debug"
# Name "wxpng - Win32 DLL Universal Release"
# Name "wxpng - Win32 DLL Universal Unicode Debug"
# Name "wxpng - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\png\png.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngerror.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pnggccrd.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngget.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngmem.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngpread.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngread.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngrio.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngrtran.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngrutil.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngset.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngtrans.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngvcrd.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngwio.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngwrite.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngwtran.c
# End Source File
# Begin Source File
SOURCE=..\..\src\png\pngwutil.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,455 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxregex" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxregex - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxregex.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxregex - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxregex - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxregex"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
!ENDIF
# Begin Target
# Name "wxregex - Win32 Debug"
# Name "wxregex - Win32 Release"
# Name "wxregex - Win32 Unicode Debug"
# Name "wxregex - Win32 Unicode Release"
# Name "wxregex - Win32 Universal Debug"
# Name "wxregex - Win32 Universal Release"
# Name "wxregex - Win32 Universal Unicode Debug"
# Name "wxregex - Win32 Universal Unicode Release"
# Name "wxregex - Win32 DLL Debug"
# Name "wxregex - Win32 DLL Release"
# Name "wxregex - Win32 DLL Unicode Debug"
# Name "wxregex - Win32 DLL Unicode Release"
# Name "wxregex - Win32 DLL Universal Debug"
# Name "wxregex - Win32 DLL Universal Release"
# Name "wxregex - Win32 DLL Universal Unicode Debug"
# Name "wxregex - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\regex\regcomp.c
# End Source File
# Begin Source File
SOURCE=..\..\src\regex\regerror.c
# End Source File
# Begin Source File
SOURCE=..\..\src\regex\regexec.c
# End Source File
# Begin Source File
SOURCE=..\..\src\regex\regfree.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,571 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxtiff" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxtiff - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxtiff.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxtiff - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxtiff - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxtiff"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxtiff.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
!ENDIF
# Begin Target
# Name "wxtiff - Win32 Debug"
# Name "wxtiff - Win32 Release"
# Name "wxtiff - Win32 Unicode Debug"
# Name "wxtiff - Win32 Unicode Release"
# Name "wxtiff - Win32 Universal Debug"
# Name "wxtiff - Win32 Universal Release"
# Name "wxtiff - Win32 Universal Unicode Debug"
# Name "wxtiff - Win32 Universal Unicode Release"
# Name "wxtiff - Win32 DLL Debug"
# Name "wxtiff - Win32 DLL Release"
# Name "wxtiff - Win32 DLL Unicode Debug"
# Name "wxtiff - Win32 DLL Unicode Release"
# Name "wxtiff - Win32 DLL Universal Debug"
# Name "wxtiff - Win32 DLL Universal Release"
# Name "wxtiff - Win32 DLL Universal Unicode Debug"
# Name "wxtiff - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\tiff\tif_aux.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_close.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_codec.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_compress.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_dir.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_dirinfo.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_dirread.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_dirwrite.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_dumpmode.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_error.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_fax3.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_fax3sm.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_flush.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_getimage.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_jpeg.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_luv.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_lzw.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_next.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_open.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_packbits.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_pixarlog.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_predict.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_print.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_read.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_strip.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_swab.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_thunder.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_tile.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_version.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_warning.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_win32.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_write.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\tif_zip.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,495 +0,0 @@
# Microsoft Developer Studio Project File - Name="wxzlib" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxzlib - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_wxzlib.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxzlib - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\wxzlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
!ENDIF
# Begin Target
# Name "wxzlib - Win32 Debug"
# Name "wxzlib - Win32 Release"
# Name "wxzlib - Win32 Unicode Debug"
# Name "wxzlib - Win32 Unicode Release"
# Name "wxzlib - Win32 Universal Debug"
# Name "wxzlib - Win32 Universal Release"
# Name "wxzlib - Win32 Universal Unicode Debug"
# Name "wxzlib - Win32 Universal Unicode Release"
# Name "wxzlib - Win32 DLL Debug"
# Name "wxzlib - Win32 DLL Release"
# Name "wxzlib - Win32 DLL Unicode Debug"
# Name "wxzlib - Win32 DLL Unicode Release"
# Name "wxzlib - Win32 DLL Universal Debug"
# Name "wxzlib - Win32 DLL Universal Release"
# Name "wxzlib - Win32 DLL Universal Unicode Debug"
# Name "wxzlib - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\zlib\adler32.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\compress.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\crc32.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\deflate.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\gzio.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\infblock.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\infcodes.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\inffast.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\inflate.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\inftrees.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\infutil.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\trees.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\uncompr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\zlib\zutil.c
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,661 +0,0 @@
# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=xml - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_xml.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wx_xml.mak" CFG="xml - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "xml - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25d_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug
!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug
!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\xml"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\xml"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase250u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase250u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib"
!ENDIF
# Begin Target
# Name "xml - Win32 Debug"
# Name "xml - Win32 Release"
# Name "xml - Win32 Unicode Debug"
# Name "xml - Win32 Unicode Release"
# Name "xml - Win32 Universal Debug"
# Name "xml - Win32 Universal Release"
# Name "xml - Win32 Universal Unicode Debug"
# Name "xml - Win32 Universal Unicode Release"
# Name "xml - Win32 DLL Debug"
# Name "xml - Win32 DLL Release"
# Name "xml - Win32 DLL Unicode Debug"
# Name "xml - Win32 DLL Unicode Release"
# Name "xml - Win32 DLL Universal Debug"
# Name "xml - Win32 DLL Universal Release"
# Name "xml - Win32 DLL Universal Unicode Debug"
# Name "xml - Win32 DLL Universal Unicode Release"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\xtixml.cpp
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "xml - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\xml\xml.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtixml.h
# End Source File
# End Group
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\xml\xml.cpp
# End Source File
# End Group
# End Target
# End Project

1400
config.guess vendored

File diff suppressed because it is too large Load Diff

1411
config.sub vendored

File diff suppressed because it is too large Load Diff

37105
configure vendored

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More