Compare commits

...

2015 Commits

Author SHA1 Message Date
Bryan Petty
5c929973c2 This commit was manufactured by cvs2svn to create tag
'BEFORE_DERIVING_FROM_STATIC_BOX'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/BEFORE_DERIVING_FROM_STATIC_BOX@30973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 20:27:35 +00:00
Vadim Zeitlin
24181682fa don't use WS_EX_TRANSPARENT style, it doesn't seem to help with anything (if it is readded, please make sure to explain why exactly was it needed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 20:27:35 +00:00
Vadim Zeitlin
5554336399 check for any parent with non default background in wxControl::MSWControlColor(), not just wxNotebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 20:21:16 +00:00
Vadim Zeitlin
7af99268d4 override MSWGetDefaultBgBrush() to use transparent brush
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 19:47:01 +00:00
Vadim Zeitlin
d34e375c9c added MSWGetDefaultBgBrush() to allow some derived classes to use transparent brush for erasing background
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 19:44:52 +00:00
Václav Slavík
98a50e202c even GUI test should be console app
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 19:25:46 +00:00
Vadim Zeitlin
e07e8195ae added a test for wxRect::Union()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 19:23:19 +00:00
Vadim Zeitlin
c71ce67511 fixed Union() for the case of this rectangle being empty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 19:00:42 +00:00
Vadim Zeitlin
8a8dcc3421 position the labels correctly when we're created with fixed size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 18:59:42 +00:00
Vadim Zeitlin
7fe985eede create controls with 1*1 size by default, not 0*0 as it wreaks havoc with wxRect::Union logic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 18:56:36 +00:00
Vadim Zeitlin
bebc503c78 compilation fix for wxUSE_TOGGLEBTN == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 18:32:26 +00:00
Vadim Zeitlin
5294a27e95 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 18:09:32 +00:00
Vadim Zeitlin
d5f330f9bc unused var warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 17:59:41 +00:00
Vadim Zeitlin
8a8997c3be fixed broken logic in ShowFullScreen() (some compiler warnings are helpful)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 17:58:33 +00:00
Vadim Zeitlin
8da1f9a99e delete children in ~wxWindow dtor and not in the base class ~wxWindowNative as it's too late there (replaces patch 1082605; closes bug 1068000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 17:47:06 +00:00
Vadim Zeitlin
0ce5a3a853 fixed SaveDIB() crash with BW images (patch 1045884)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 17:40:00 +00:00
Vadim Zeitlin
8193d58f17 include <windows.h> before <multimon.h>, should fix mingw32 compilation (bug 966947)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 17:34:36 +00:00
Stefan Csomor
0842200308 scrolling hack (always move our own scrollbars highest in z-order)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 15:22:49 +00:00
Václav Slavík
a0744a6b06 added GUI test program
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 12:35:45 +00:00
Václav Slavík
4d6b57d615 moved tests-only code to tests bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 12:29:39 +00:00
Vadim Zeitlin
f8fbc92bdb disable gcc warning about class having private dtors and no friends (patch 1065318)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:55:37 +00:00
Vadim Zeitlin
70a7bd90f9 large files support for wxFFile (patch 1077980 from Mike Wetherell)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:53:53 +00:00
Vadim Zeitlin
34ea3c7491 only handle WM_NULL in wxIdleWakeUpModule if it is being removed from queue (part of patch 1080770)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:49:32 +00:00
Vadim Zeitlin
9af08eb826 use a linked list instead of array for saved messages to fix problems when Dispatch() is reentered (part of patch 1080770)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:47:57 +00:00
Vadim Zeitlin
18dbea4d81 stop processing pending events after processing all of them which had been in the queue when we started, not until there are none as this could result in an infinite loop (part of patch 1080770)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:44:46 +00:00
Vadim Zeitlin
5767e83699 fixed bug with lower-case colours in wxColourDatabase::AddColour() (patch 1074865)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:21:15 +00:00
Vadim Zeitlin
14b4c0ff12 gravity for splitter window (patch 1046105)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:19:36 +00:00
Vadim Zeitlin
4116fac052 cross-reference types in the generated docs (patch 1038083)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:12:25 +00:00
Vadim Zeitlin
ffa4348d33 give an error message if we're built in Unicode mode (in response to bug 1079224)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:03:31 +00:00
Vadim Zeitlin
dc9dadac18 include <windows.h> in tests for multimon.h, ddraw.h and dshow.h as otherwise they don't risk to work (closes 1083808)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 11:01:39 +00:00
Vadim Zeitlin
3ea9aa8f0e removed extra class qualifier from inline method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 10:33:51 +00:00
Vadim Zeitlin
e5099bdf4b master setup.h for msvc users
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 10:33:03 +00:00
Stefan Csomor
9d51726702 10.4 header collision fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 10:00:39 +00:00
Ryan Norton
350a44d9c0 fix wxTheApp include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 09:15:28 +00:00
Kevin Hock
a34cc2bf6d Revert change to wording... it is correct to have "aN 1800-page" because the full wording is "an eighteen hundred-page," where the an is clearly correct (say it out loud and it is clear than you would not say "a eighteen hundred-page")
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 01:37:40 +00:00
Vadim Zeitlin
ab022a5c7a don't look for notebooks beyond first top level parent in our hierarchy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 00:09:40 +00:00
Vadim Zeitlin
e96ec686d8 never return NULL_BRUSH from WM_CTLCOLOR handler, it doesn't do much for most controls and breaks background erase for a few (slider, static text, static bitmap, ...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 00:06:43 +00:00
Vadim Zeitlin
6181cef532 use MSWAlwaysDrawBg() to fix the problem with black background; rewrote/cleaned up the positioning and window creation code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 23:35:41 +00:00
Vadim Zeitlin
19fdd4efb6 helper class for implementing composite controls under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 23:35:27 +00:00
Vadim Zeitlin
c5c4c31e6c added MSWAlwaysDrawBg() to account for controls such as sliders which must not draw background with transparent brush no matter what
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 23:34:15 +00:00
Vadim Zeitlin
9688700c97 added wxRectFromRECT()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 23:32:20 +00:00
Vadim Zeitlin
df83b840bb added and documented wxRect::Union(); also moved some methods inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 23:29:55 +00:00
Robert Roebling
c28cb884de A bit of updating the changes.txt etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 21:54:12 +00:00
Robert Roebling
f773e9b0bb Backed-out PNG8 patch (no time to look at why
it breaks other PNGs).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 21:52:36 +00:00
Robert Roebling
3980000ca6 Whole bunch of minor doc updates from an external patch.
Also documented combobox's EVT_TEXT_ENTER


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 21:33:17 +00:00
Vadim Zeitlin
88379f1f2e translate VK_OEM_PLUS to '=', not '+', because this is what the unmodified key is
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 20:01:05 +00:00
Robert Roebling
ababa106ae Add SetFocusIgnoringChildren() to wxControlContainer. This
makes corresponding hacks in wxListCtrl and wxTreeCtrl
    obsolete. With docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-11 12:51:05 +00:00
Włodzimierz Skiba
d61f720033 Bug #1040683: Remove assert when deleting menu entry.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 16:20:13 +00:00
Włodzimierz Skiba
7a8d94185f wxFoldBar now also horizontal (with API methods renamed to mean length rather than height) and more with wxWidgets coding standards. Sample adjustement to changing orientation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 12:01:04 +00:00
Julian Smart
b9a59c919c Workaround for memory bug when using wxRegConfig and calling
SetPath.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 11:24:10 +00:00
Vadim Zeitlin
a21d4ad106 really implemented operator==(); reformatted a little
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 11:23:16 +00:00
Włodzimierz Skiba
de4b00500f Back to broken comparison until it is not fixed other way.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 07:28:25 +00:00
David Elliott
4c683a3021 Wrap wxImage specifics in wxUSE_IMAGE and wxBitmap specifics in wxUSE_GUI.
This allows the code to be used from wxBase with other image classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-10 01:53:31 +00:00
Vadim Zeitlin
55b5ddad74 compilation fix for wxUSE_DATAOBJ == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 19:39:17 +00:00
Julian Smart
4e324a3fbf Combobox corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 15:27:54 +00:00
Julian Smart
150e31d208 Added further 'missing' wxTextCtrl-like functions to wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 15:16:51 +00:00
Ryan Norton
8d7ea2312e fixup {/'s with last commit
merge pre tag change from wxWebSite


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 15:10:07 +00:00
Julian Smart
966a4a52b6 Spelling corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 14:59:08 +00:00
Julian Smart
14186b44e7 Small correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 14:16:20 +00:00
Julian Smart
15a2de7e4f Misc FAQ mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 14:14:01 +00:00
Robin Dunn
03e46024f9 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 00:21:25 +00:00
Robin Dunn
c9c2cf703c Use SetMinSize instead of SetSizeHints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-09 00:21:19 +00:00
Mattia Barbon
7d9cfc5483 Moved tests for wxHashMap, wxHashSet and wxList
from console sample and converted them to unit tests.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:39:22 +00:00
Mattia Barbon
d7ab66a1cb Made wxHashSet compile again. Changed the return value
for insert() t match the one of wxHashMap (and of std::set).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:39:17 +00:00
Mattia Barbon
8cd74a14cd Documented wxHashSet.
Corrected documentation for wxHashMap::insert() mentioning
the correct return value.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:33:40 +00:00
Robert Roebling
e854ed477e Applied patch for PNG8 alpha mask.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:29:25 +00:00
Mattia Barbon
4ae1af0588 Check for Pango XFT presence (for wxX11).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:13:37 +00:00
Robert Roebling
78b3b018ce Corrected wxComboBox::GetValue() after a
selection has changed. Added test for
    that to the "widgets" sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 22:08:28 +00:00
Robin Dunn
df4192e384 Use SetMinSize instead of SetSizeHints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 21:51:07 +00:00
Robin Dunn
95262b5fa5 Some tweaks for the wxMediaCtrl and enhaced the demo a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 21:49:41 +00:00
Robin Dunn
28dfea7754 fix compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 20:36:13 +00:00
Julian Smart
55e0d33c97 Fixed spurious selection of combobox text during resize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:51:48 +00:00
Włodzimierz Skiba
917be7ed06 wxPaletteBase introduction. wxPalette::GetColoursCount() in interface of all platforms. wxColourMap definition centralized and 2.4 only. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:43:18 +00:00
Włodzimierz Skiba
767e3be0fa Fix to FIXME: better nothing than broken comparison.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:17:37 +00:00
Włodzimierz Skiba
57e7524bad Fixed bug with lack of return default style if Ok() fails.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:15:06 +00:00
Włodzimierz Skiba
c193de847b Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:12:53 +00:00
Włodzimierz Skiba
82ce8b17f7 wxApp decoration to changes list and missed new methods in wxApp section.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:00:29 +00:00
Julian Smart
df6735ecda Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 08:36:01 +00:00
Włodzimierz Skiba
ea76a6a5ca Fix to FIXME about using unused Get/SetOptimization.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 20:10:40 +00:00
Włodzimierz Skiba
c65650d7b5 wxURI/wxURL links in changes list.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 19:57:09 +00:00
Włodzimierz Skiba
a5b274d7fc Correct way of modyfing stc.cpp. Thanks Robin for quick guide :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 19:49:27 +00:00
Robin Dunn
1823fbb47a reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 18:02:20 +00:00
Robin Dunn
c6d428998f Added ImageFromDataWithAlpha ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 18:00:17 +00:00
Robin Dunn
553f11cdbf wx.GridBagSizer stor needs call to _setOORInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 17:58:39 +00:00
Robin Dunn
f63a6e0ccd Add wxTextEntryDialogStyle constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 17:57:53 +00:00
Robin Dunn
c1718b2c8a Add flags parameter to wx.Process.Kill and wx.Kill
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 17:56:22 +00:00
Robin Dunn
f6e56553ee Ensure that PlatformInfo is reverse-renamed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 17:54:57 +00:00
Robin Dunn
152d7d3516 made dates in comments consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 17:53:56 +00:00
Stefan Csomor
577b58dfe9 fixing memory leak (reported by Ken Thomases)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 07:47:15 +00:00
Stefan Csomor
7596e51dbc fixing memory leak (reported by Ken Thomases)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 07:13:43 +00:00
Robert Roebling
9f37db4291 Made sample compile after removal of wxPrintSetupDialog.
Tweak makefile to work with GNOME printing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 23:43:29 +00:00
Robert Roebling
4ba64bdeb2 Compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 23:41:28 +00:00
Václav Slavík
feb1c9fb0c fixed ShowFullScreen after somebody broke it by naively using gtk_show_fullscreen without checking if the WM supports it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 22:44:39 +00:00
Kevin Hock
0fec2f73ec wxHSCROLL works in GTK2, changed description to indicate no effect only on wxGTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:57:42 +00:00
Włodzimierz Skiba
5c750f949f Fix to FIXME removal for dummies ;-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:37:31 +00:00
Włodzimierz Skiba
abc2a4ccec Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:35:00 +00:00
Włodzimierz Skiba
c8b75e9498 ssize_t for wxFile, unsigned char markup for color components, whitespace source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:32:42 +00:00
Włodzimierz Skiba
42e88ddb61 Further decorations in changes chapter. Missed methods in their base location.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:22:49 +00:00
Włodzimierz Skiba
c5789d1526 Use Get*Box instead Get*Region if you are asking about position and size. And it is enough to have it in base class only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 15:48:50 +00:00
Robert Roebling
16edee16a7 Apply choice patch for proper handling of clearing
wxChoice (it reported a selection value of 0)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 12:47:06 +00:00
Václav Slavík
6372b068b2 fixed typos (patch 1079876)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 10:28:58 +00:00
Julian Smart
5e80ff3d31 Removed CF_NOSIMULATIONS flag to increase range of available fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 08:48:29 +00:00
Robert Roebling
77f706726c Implemented run-time checks for the GTK version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 23:03:09 +00:00
Ryan Norton
d7b995a497 Fix overflow warnings (?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 20:52:23 +00:00
Robert Roebling
4e1901b70e Moved the implemtation of the generic and the
native GTK 2.4 file dialogs into one place
   by making wxFileDialog derive from the
   generic variant and by then choosing which
   implementation to use. Later, we'll add
   run-time checks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 20:30:18 +00:00
Kevin Hock
822cf31c27 Prevent GDK assertions when a window has a hidden (never shown) parent -- do not use wxRegionIterator over the parent if the parent is not mapped
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 19:40:01 +00:00
Kevin Hock
90470763da Freeze/Thaw implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 19:15:41 +00:00
Kevin Hock
b6ae8db82b Freeze/Thaw patch missed a place where m_buffer should be used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 19:15:11 +00:00
Kevin Hock
636673edda Updating wording in Freeze to more accurately describe the situation under wxGTK where Freeze in a text control is most useful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 19:14:34 +00:00
Julian Smart
bcfced3616 Neither PocketPC nor SmartPhone have SHBrowseForFolder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 18:56:29 +00:00
Robert Roebling
121ade4fd3 Corrected patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 17:29:03 +00:00
Julian Smart
b4367c87f1 Simplification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 17:02:17 +00:00
Robert Roebling
9ddf4854df Invalidate the best size after adding an item
to a wxChoice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 16:56:56 +00:00
Robert Roebling
265accbe55 A little documentation about custom events as
per the discussion on the mailing list.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 16:30:54 +00:00
Julian Smart
ade0e73d18 Further Wince fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 14:11:35 +00:00
Julian Smart
9e67e54178 Moved GetDefaultAttributes outside wxUSE_RICHEDIT block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 14:01:29 +00:00
Julian Smart
885b88a257 Unicode/WinCE corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 13:36:44 +00:00
Julian Smart
e0f6b731a8 Added flags argument to wxKill and wxProcess::Kill to allow it to
kill child processes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-05 12:53:25 +00:00
Vadim Zeitlin
65c8ace850 update from herbert breunung
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-03 19:22:35 +00:00
Włodzimierz Skiba
c7dc771115 wxGDIObject is used earlier now so additional #include is required for those without PCH.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-03 17:31:53 +00:00
Włodzimierz Skiba
84df104241 Fix to FIXME: better nothing than broken comparison.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-03 15:38:35 +00:00
Włodzimierz Skiba
cb9d5bd07e wxBrushBase between wxBrush and wxGDIObject (class follows wxFontBase model).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-03 15:31:31 +00:00
Ryan Norton
7a4d2469f9 fix shared msw builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 23:17:51 +00:00
Kevin Hock
bdf0c19c6e Honor value of SetMaxLength, at least when typing (pasting still circumvents it). This is done by eating non-navigation/delete characters in OnChar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 21:35:40 +00:00
Ryan Norton
2b138cc2bd hack around 10.2/10.3 bug with duplicate symbol
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 18:53:18 +00:00
Julian Smart
df1f4832e5 Spelling corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 16:16:51 +00:00
Julian Smart
a83ea9c15a Crash fix under VC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 16:14:49 +00:00
Julian Smart
aaf1bbfd62 Fixed memory checking on Unix by removing inlines and apply patch
by Mart Raudsepp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 12:04:46 +00:00
Julian Smart
c242a1ec6d Use the right symbol
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 12:03:45 +00:00
Julian Smart
5c2cd0f67a Fix compilo on Unix using src/iodbc which has no SQL_C_WCHAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 09:42:03 +00:00
Ryan Norton
ff3d9a3532 better name - add newline to end of file for dumber compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-02 00:02:11 +00:00
Ryan Norton
c08dd08b3e add wxStripExtension test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 23:58:11 +00:00
Ryan Norton
2cbfa061b4 Correct mistakes in wxStripExtension - correct wxString::npos. Spurred by 1073642 filefn.cpp StripExtension(wxString &)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 23:55:42 +00:00
Robin Dunn
fab7c93158 ensure that yesr is an integer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 22:00:43 +00:00
Robert Roebling
d6c6acd640 Added support for GNOME print in static builds
also by adding the FORCE_LINK() statements.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 21:35:26 +00:00
Robert Roebling
4ea56379e3 Added support for static (inlined) wxImages with
alpha channel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 21:33:38 +00:00
Robert Roebling
41b81aed52 Applied Freeze()/Thaw() patch for wxTextCtrtl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 20:52:36 +00:00
Robert Roebling
70dfc4ed70 Compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 19:15:46 +00:00
Robert Roebling
1523681581 Applied font scaling patch (GetTextExtent()) to
new printing code as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 18:44:50 +00:00
Robert Roebling
86baa52d22 Applied patch to "correct" hashmap's freeing
of memory.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 18:33:33 +00:00
Robert Roebling
0b18767089 Applied patch to correct EVT-CHAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 18:29:13 +00:00
Julian Smart
c86abb56d5 Include "wx/msw/msvcrt.h" for better leak reporting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 14:46:16 +00:00
Julian Smart
ea787af196 Allow memcheck.cpp to be compiled without wxDebugContext (for e.g. testing
using other leak checkers).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 12:50:24 +00:00
Włodzimierz Skiba
68d411dc57 Missing wxWindow member, manual decorations to pure text list of changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 08:53:31 +00:00
Kevin Hock
254973247e Create wxGtkTextApplyTagsFromAttr for common processing of text attributes from both wxGtkTextInsert and SetStyle (and any other place needed in the future) -- from Mart R.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 04:28:40 +00:00
Robin Dunn
f78cc8969d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 00:12:58 +00:00
Robin Dunn
020303e6f9 Little tweaks to match recent wxWidgets updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-01 00:06:58 +00:00
Robin Dunn
4e819f106b In the wx.LogXXX function wrappers double all % characters so the log
function won't try to do parameter substitutions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 22:10:31 +00:00
Włodzimierz Skiba
842215bbb7 Fixed old FIXME about unsigned result of sunstraction + a few changes to be able to compile at the same time wxLongLongNative and wxLongLongWx for unit tests about the same functionality (define wxLONGLONG_TEST_MODE for the build if you want to test it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 21:21:23 +00:00
Włodzimierz Skiba
6e848e9310 Duplicate include order from regex because it's well tested already and avoids the error in Unicode DMC build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 20:57:13 +00:00
Włodzimierz Skiba
891479a2da Additional wx*_HATCH styles comment.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 18:52:47 +00:00
Włodzimierz Skiba
ab9d0a8ca3 IS_HATCH macro replaced with wxBrush::IsHatch() + source and docs little cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 18:46:20 +00:00
Kevin Hock
44ac608d14 gtk_window_[un]fullscreen only available with GTK >= 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 18:13:39 +00:00
Julian Smart
30413fd03e Added missing newline for Windows debug output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-30 16:55:42 +00:00
Włodzimierz Skiba
e70fda0eab Not native long long fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-29 12:47:20 +00:00
Włodzimierz Skiba
86a9d44545 Include fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-29 12:44:11 +00:00
Robert Roebling
3314e67b6a Remove linking to libgnomeprint since we
load it at runtime now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 22:57:43 +00:00
Robert Roebling
59c73be893 Made all of the GNOME print support based
on wxDynamicLibrary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 22:55:44 +00:00
Robert Roebling
c2740a5aab Dirty hack to prevent double destruction of file dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 22:54:13 +00:00
Stefan Neis
5bef7b5828 Separated MinGW and OS/2 specific tests for -DNO_GCC_PRAGMA since conditions
are slightly different.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 19:38:11 +00:00
Stefan Neis
937e42a324 Reuse workaround for MinGW's problems with pragma interface/implementation
and STL support on OS/2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 18:42:15 +00:00
Stefan Neis
2461cfa0d9 Added support for compiling with wxUSE_STL set to 1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 18:39:30 +00:00
Robert Roebling
c6efd6e0ec Start of run-time lookup of GNOME print libs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 17:55:48 +00:00
Robert Roebling
a733492856 Reverted changes that set m_widget to NULL in native
GTK+ dialogs for now. The problem persists, that
    when quitting the native file dialog with ESC, the
    dialog will be destroyed twice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 13:08:26 +00:00
Václav Slavík
6120f2fcdb fixed subtle SetDirectory bug re-introduced by latest changes (explained in comment in UpdateDialog); reintroduced UpdateDialog so that fixes like this are kept in single place and affect all ways of setting the patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 10:49:01 +00:00
Václav Slavík
c019209981 reverted, the problem is deeper than that
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 09:41:36 +00:00
Václav Slavík
e0107cbd45 fixed to not duplicate code needlessly; clarified why gtk_file_chooser_set_current_name is called as it is
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 09:33:43 +00:00
Robert Roebling
82c1f2a390 Make use of new Art.
Add sections to the dir dialog as per the
   GTK 2.4 file dialog (Home, Desktop, "/").


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:25:30 +00:00
Robert Roebling
ddf6088b1e Added new Art which GTK+ 2.4 defines and
which we should use.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:23:47 +00:00
Robert Roebling
f1dec25f31 Avoid error message when closing message
dialog with the X field from the WM.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:21:12 +00:00
Robert Roebling
c7f73af494 Make wxTR_NO_LINES default under GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:19:49 +00:00
Robert Roebling
76840ed0db Fixes for file dialog. No longer spits out
GTK error messages.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:18:40 +00:00
Václav Slavík
4ac725a3b3 renamed Render's argument to not obfuscate its meaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 22:40:05 +00:00
Robert Roebling
39a77f4cd9 A bit of confusion over what is RGB stands for blue...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 18:48:33 +00:00
Robert Roebling
4d1bc39c96 Give native GTK+ look to wxGrid.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 16:30:03 +00:00
Václav Slavík
848c4eb27b fixed wxHtmlContainerCell to not render off-screen cells
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 13:08:54 +00:00
Robert Roebling
cac7ac30cb Added support for DrawEllipse and pen styles to
GNOME printing. Added test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 12:50:01 +00:00
Julian Smart
ece835440d Doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 10:39:33 +00:00
Václav Slavík
5f652d0da4 FreeBSD fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-26 16:43:18 +00:00
Ryan Norton
f44eaed650 patch 1073385
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 20:37:44 +00:00
Vadim Zeitlin
b494e2b008 added missing header needed at least by wxMotif under HP-UX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 18:08:29 +00:00
Włodzimierz Skiba
516ab39908 wxUSE_GAUGE/PROGRESSDLG condition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 18:05:12 +00:00
Vadim Zeitlin
410c3efc05 removed cleanup module which was only used for working around bugs in memory debugging code which were fixed since
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 17:56:47 +00:00
Włodzimierz Skiba
e9043580b8 Nicer and longer fading.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 17:48:10 +00:00
Stefan Csomor
375bb200e3 removed explicit IDs for scrollbars on mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 17:42:50 +00:00
Włodzimierz Skiba
063b752ebc wxProgressDialog needs progress bar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 17:00:31 +00:00
Włodzimierz Skiba
4d4e1be2ef DMC conflicts with old SC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 16:53:41 +00:00
Ryan Norton
47b3cc5cac fix non-standard c warnings - stab to fix overflow warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 15:34:38 +00:00
Vadim Zeitlin
524065c14e added test for wxUSE_SCROLLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 14:53:08 +00:00
Vadim Zeitlin
2c62dd25cd changed the code to be really sure that exactly one update event is sent when SetValue() is called
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 14:43:54 +00:00
Václav Slavík
034e304169 updated to generate ZIP files with DOS line endings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 11:40:34 +00:00
Václav Slavík
2a2e4f4afa reverted Robert's over-optimisation, correct fix coming soon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 08:32:49 +00:00
Stefan Csomor
64631e82fd const comparison operators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-25 05:21:32 +00:00
Vadim Zeitlin
00cfda56d2 removed [GS]etAuto3D() which don't exist any more since quite some time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 23:33:46 +00:00
Ryan Norton
d4052bcb78 replace apple extended code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 22:42:37 +00:00
Ryan Norton
2f4bebe8ff data stream test for extended
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 22:31:25 +00:00
Vadim Zeitlin
df10208f26 don't disable non top tabs if visual themes are not used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:54:00 +00:00
Vadim Zeitlin
41bd216844 removed msw.xp-tab-ok, in fact it is not needed as tabs never work correctly with visual theme enabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:51:01 +00:00
Vadim Zeitlin
1972900ebf define inline stubs for methods even with wxUSE_SYSTEM_OPTIONS == 0 to make it possible to test for system options without #ifdefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:25:55 +00:00
Ryan Norton
11219c9ede finish getting rid of background flicker (MCI backend)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:24:11 +00:00
Vadim Zeitlin
82a16d7e5e added (and documented) msw.xp-tab-ok option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:24:09 +00:00
Ryan Norton
e163773d41 reduce black background flicker a bit - there is still some left sometimes initially (MCI backend)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 21:21:13 +00:00
Robert Roebling
58bd6224ac Changed the way invisble HTML cells are NOT
drawn so that no clipping is required.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 20:28:19 +00:00
Robin Dunn
6e0de3dfc4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 20:10:40 +00:00
Robin Dunn
8ac8dba00c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:52:08 +00:00
Robin Dunn
9828eeb4a3 added overview text for wx.MediaCtrl demo, udpated CHANGES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:49:08 +00:00
Robin Dunn
4d5009f903 Fixes for the stubbed version so it will compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:45:41 +00:00
Robin Dunn
870501f0c9 Added wrappers for wx.MediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:34:54 +00:00
Ryan Norton
503271a574 regen bakefiles - get rid of explicit size setting after ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:27:06 +00:00
Robin Dunn
256c055e88 Added wrappers for wx.MediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:21:30 +00:00
Robin Dunn
2c25de3ff6 added GetSelection for wxMSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:15:52 +00:00
Ryan Norton
973dc0a8ee prevent function hiding - move NextBackend into protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:15:27 +00:00
Robin Dunn
b5093969a2 docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:14:45 +00:00
Ryan Norton
4ac6131914 fix a loading bug - set size if movie is passed into ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 19:10:44 +00:00
Włodzimierz Skiba
1b1304a080 Distribute splash screen sample mpg.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 17:26:27 +00:00
Włodzimierz Skiba
6bb44116c2 wxUSE_SLIDER=0 fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 16:08:12 +00:00
Włodzimierz Skiba
455a9ca633 wxMediaCtrl in wxSplashScreen presentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 15:49:40 +00:00
Włodzimierz Skiba
f730d6df2e Should be binary.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 15:46:53 +00:00
Włodzimierz Skiba
b1096e4573 wxMediaCtrl in wxSplashScreen presentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 15:43:56 +00:00
Robert Roebling
0cf3b5429a Applied patch to stop crashing the tree control
when deleting a selected item. Also does something
   to the inplace edit control.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 15:03:28 +00:00
Robert Roebling
ad68ed32f7 Applied patch to remoce surplus text update evevt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 14:51:44 +00:00
Robert Roebling
a9e003065d Applied kill patch (proper return value testing).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 14:38:49 +00:00
Włodzimierz Skiba
fc84bd0570 Expression simplifications for scaling and inflating.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 14:18:20 +00:00
Włodzimierz Skiba
11085e4baf Let's really remove border.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 14:01:47 +00:00
Jouk Jansen
44f3342ecc Committing in .
OpenVMS changes

 Modified Files:
	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/unix/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 10:25:41 +00:00
Robin Dunn
c220a8ec4f More DLL build fixes for wxMediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 00:07:45 +00:00
Václav Slavík
f3613896af compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 21:01:00 +00:00
Włodzimierz Skiba
0e871ad039 Fixes for wxUSE_SPIN... == 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 20:08:56 +00:00
Włodzimierz Skiba
44d60c0b26 Fix for assert after left click on tree in generic dir dialog in native MSW build. Source cleaning and readability fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 19:58:47 +00:00
Robin Dunn
f05ebffd6b wxBookCtrl --> wxBookCtrlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 18:43:26 +00:00
Robin Dunn
32bf5e4a38 wxPageSetupDialog no longer derives from wxDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 18:20:41 +00:00
Robin Dunn
1c272b5d9e wxBookCtrl --> wxBookCtrlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 18:20:03 +00:00
Robin Dunn
a3c9f0642c docstring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 18:19:25 +00:00
Włodzimierz Skiba
b5a5b77df0 Be in sync with wxW version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 17:40:26 +00:00
Julian Smart
4f6b4292aa Calculate better height for toolbar (add borders)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 16:51:15 +00:00
David Elliott
0a1390c7d8 Seek calls take an offset which can validly be negative. Use >= LONG_MIN not 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 16:22:43 +00:00
Vadim Zeitlin
6ab3c239ea regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 15:00:58 +00:00
Ryan Norton
316d19aca0 a stab at a dll fix for media lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 14:56:03 +00:00
Chris Elliott
fb88ba480b SF patch 1067466
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 14:54:38 +00:00
Ryan Norton
8f0ff17851 [ 1070686 ] wxOutputStream::Close()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 14:26:10 +00:00
Ryan Norton
95662a8379 Lots and lots and lots of MSVC fixes for archive stuff, some stuff from patch 1071373
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 13:49:43 +00:00
Dimitri Schoolwerth
36b79d445d fixed #includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:53:57 +00:00
Vadim Zeitlin
b01a88e050 don't show the status bar after restoring normal view after full screen if it had been hidden all along (bug 1071354); code cleanup: removed unused variables, reduced #ifdefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:53:34 +00:00
Ryan Norton
ff2b312fc8 dll fixes for media lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:46:51 +00:00
Vadim Zeitlin
1d55654928 update from Tsolakos Stavros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:29:53 +00:00
Włodzimierz Skiba
1af34108c4 wxCHB<->wxNB flags switch fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:02:15 +00:00
Włodzimierz Skiba
3e1a5afdd2 wxBookCtrl->wxBookCtrlBase. wxBookCtrl is now most suitable book for given platform. Samples adjustement.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 11:51:50 +00:00
Włodzimierz Skiba
61c083e781 wxBookCtrl->wxBookCtrlBase. wxBookCtrl is now most suitable book for given platform. Samples adjustement.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 11:45:07 +00:00
Julian Smart
13e175eafc Changed GPL to wxWindows Licence
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 09:54:12 +00:00
Vadim Zeitlin
8329fea8ad rebaked after adding src/tiff/tif_color.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 08:46:26 +00:00
Robin Dunn
b6176ab722 Fixes for DemoCodeEditor for when there is no STC available.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 22:31:04 +00:00
Vadim Zeitlin
f616aec7dc don't apply tab control background when using wxUniv, it renders background itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 22:19:34 +00:00
Robert Roebling
cffcf831ad Work in progress on printing stuff.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 21:50:31 +00:00
Julian Smart
6442cf6b20 Added licence line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 21:07:50 +00:00
Julian Smart
ab4d1ea9cd Licence line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:57:03 +00:00
Julian Smart
2422dcbcb0 Licence for Lacheck unclear, so removing from CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:50:14 +00:00
David Elliott
90d3f91a04 Set m_minWidth, m_minHeight so that GetBestSize() works properly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:41:04 +00:00
Julian Smart
053950ae73 Added missing licence line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:40:22 +00:00
Julian Smart
a75d986396 Licence correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:28:28 +00:00
Julian Smart
c6afb815cf Fixed licence lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:22:27 +00:00
David Elliott
7bf8eb78aa Do not move the wxMDIParentFrame to (-10000,-10000) if it has a toolbar.
NOTE: Ideally the toolbar would be moved internally to wxMac into its own
floating frame and then the question of whether the parent frame should be
hidden would be one of "does it not have controls OTHER than a toolbar?"


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:19:37 +00:00
David Elliott
0bba37f51d Fix centering of top-level children of wxMDIParentFrame on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:10:53 +00:00
Julian Smart
58b9c9badd Added wxWindows licence to match other files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:10:26 +00:00
Julian Smart
05aa8cf3ef Added accidentally omitted license to match source files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 20:05:26 +00:00
Julian Smart
9838b28444 Doesn't conform to license conditions, so removing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 19:57:59 +00:00
Julian Smart
4188e09243 Removed unnecessary files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 19:52:14 +00:00
Włodzimierz Skiba
f0fb3b3b60 GCC fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 19:32:37 +00:00
Włodzimierz Skiba
51e298bbbb GCC fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 17:48:33 +00:00
Włodzimierz Skiba
f9df3f0586 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 17:45:20 +00:00
Vadim Zeitlin
f43707413a (blind) fix for GTK2/Unicode crashes when copying text to the clipboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 17:37:58 +00:00
Ryan Norton
53638fe05b guess to get initial font selection working on OSX 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 17:18:58 +00:00
Kevin Hock
c2094564d7 At least under GTK2, we do not need m_widget->window to be non-NULL in order to successfully change the background colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 16:37:27 +00:00
Julian Smart
2faa8e74b5 Note about copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 16:37:10 +00:00
Vadim Zeitlin
bb180f9057 compilation fix for USE_PCH == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 16:22:12 +00:00
Ryan Norton
6d5a34485b delete-->delete[]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 16:02:26 +00:00
Julian Smart
706fb8932a Changed Rocketeer licence to wxWindows licence, by authorisation
of the copyright holder, Johnny C. Norris II


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 15:55:34 +00:00
Włodzimierz Skiba
724d491f1d Empty line at the end.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 15:12:29 +00:00
Włodzimierz Skiba
9f9f75b380 Fix the assert of not reset highlighted menu item pointer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 12:36:07 +00:00
Ryan Norton
18591f2f81 PutChar doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 05:25:13 +00:00
Ryan Norton
c5d99d7b5c UNICODE-capatable UTF8 implementation of wxStringXXXStream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 05:05:04 +00:00
Ryan Norton
8899b155a1 [ 1068188 ] Precompiled header for the test program [Modified a bit]
Regen bakefiles for unit tests


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-22 05:00:19 +00:00
Kevin Hock
955f0add89 The presence of the effects controls (i.e. color) should not depend on whether or not a color is present in the font data, but rather whether or not EnableEffects is true or false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 19:57:44 +00:00
Ryan Norton
8c6be1a881 Unicode logic fixes for AddEntries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 19:21:17 +00:00
Ryan Norton
0868a03009 Hack around MSVC 6 for forward declarators (from Mike W)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 18:59:36 +00:00
Ryan Norton
ba8546912d wxTextOutputStream::PutChar and text stream test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 18:26:38 +00:00
Ryan Norton
2c09fb3b8b wxMemxxx --> wxTmemxxx, get rid of wxdocmpxxx impossible case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 17:44:40 +00:00
Ryan Norton
4130044adf Remove silly include (from me I guess :))
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 17:11:38 +00:00
Ryan Norton
56863b1608 MSVC 6 compilo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 17:10:25 +00:00
Vadim Zeitlin
39ccbf9a31 fix for a crash with wxUSE_STL == 1: test for failed conversion in GetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 12:21:14 +00:00
Robin Dunn
891bb1943f reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 00:51:22 +00:00
Robin Dunn
148275d324 Make the event ID used for wx.CallAfter be an attribute of the app so
when and addition all wx.App objects are created a new ID will be
generated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 00:49:01 +00:00
Robin Dunn
b0cafb9172 Make the event ID used for wx.CallAfter be an attribute of the app so
when and addition all wx.App objects are created a new ID will be
generated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 00:43:38 +00:00
Robin Dunn
fc71d09b42 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-21 00:29:20 +00:00
Robert Roebling
06cfd325c3 Huurrayy, the GNOME page setup dialog is
broken in its native version. All the
   fuss for nothing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 23:11:40 +00:00
Robin Dunn
5f21cfa9f9 Fix wxInputStream out typemap to allow SWIG to determine if thisown
should be set or not.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 22:02:29 +00:00
Robert Roebling
891daf8c1e Forgot to commit this one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 14:50:55 +00:00
Robert Roebling
08680429a2 Made wxPageSetupDialog a pimpl implementation.
Added a few clean-ups.
  Added native GNOME page setup dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 14:46:25 +00:00
Václav Slavík
14470b4477 unzip.h is no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 11:13:31 +00:00
Václav Slavík
48ccbb3859 don't use precompiled headers with dosyacc.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 11:10:47 +00:00
Vadim Zeitlin
7da0253866 new files in libtiff 3.6.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 00:17:39 +00:00
Robert Roebling
32f2ebbf2f Use GTK+ calls for fullscreen mode.
Fix bug with wrong tlw position after
    a sequence of hide/show.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 00:00:49 +00:00
Robert Roebling
1d65e535d5 Corrected positioning of rotated text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 23:15:14 +00:00
Robin Dunn
828cff190d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 23:03:05 +00:00
Robin Dunn
8fb0e70a5d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 22:59:49 +00:00
Vadim Zeitlin
9f486b326a gave different accels to different radio items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 22:35:22 +00:00
Vadim Zeitlin
00cb87b4be upgraded libtiff to 3.6.1 + security fixes (patch from Tim Kosse)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 22:29:47 +00:00
Robin Dunn
0d3ba5ebc6 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 22:15:49 +00:00
Robin Dunn
bb6e96a9e5 Docstring fix for GetInstallPrefix/SetInstallPrefix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 22:00:02 +00:00
Vadim Zeitlin
1a38c220e1 last commit broke compilation for wxUSE_UXTHEME == 0; fixing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 21:52:18 +00:00
Vadim Zeitlin
83c4e1ee2d removed unneeded wx/notebook.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:51:16 +00:00
Vadim Zeitlin
9b7d2b81cc added another DoEraseBackground overload (no real changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:50:25 +00:00
Vadim Zeitlin
65546961ea create BS_GROUPBOX transparent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:49:30 +00:00
Włodzimierz Skiba
e1d6e01c88 Sorting fixes to wxUniv wxCombo/ListBox [part of bug #1040593].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:38:04 +00:00
Vadim Zeitlin
b8a9578b80 don't draw themed background for standard controls; they do it themselves and so this only results in even more flicker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:37:20 +00:00
Vadim Zeitlin
012e1eebae always return solid background for listbox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:36:23 +00:00
Vadim Zeitlin
a8da30af84 added MSWControlColorDisabled and MSWControlColorSolid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:35:41 +00:00
Vadim Zeitlin
e6f3cbd272 added missing header for USE_PCH == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:18:02 +00:00
Robin Dunn
0bfd735e1f Remove py_objasdbl_conv typedef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:06:09 +00:00
Robin Dunn
3b03eb99e9 wxHtmlHelpController doesn't derive from wxEvtHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:04:51 +00:00
Vadim Zeitlin
750972abb4 refresh widget after changing its colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:04:22 +00:00
Robin Dunn
fbb9eac06c Added GetCurrentPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 20:03:06 +00:00
Robin Dunn
6f7ecb3bee Added ConvertColourToAlpha
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:57:21 +00:00
Vadim Zeitlin
18342f1993 don't set background colour explicitely; no need to handle WM_ERASEBKGND ourselves now that it is done correctly at wxControl level
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:55:34 +00:00
Vadim Zeitlin
5c836c463a refactored code to do brush adjustment for bg drawing in only one place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:53:03 +00:00
Vadim Zeitlin
48fa6bd38a replaced OnCtlColor(7 params) with MSWControlColor(1 param)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:40:31 +00:00
Robin Dunn
f464a4f2af Added wxPyInputStream dtor. Use PyLong_FromLongLong iff needed for wxFileOffset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:28:46 +00:00
Robin Dunn
cde9174af0 Use static method for AddCatalogLookupPathPrefix instead of global function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:23:23 +00:00
Robin Dunn
2b02216951 Give SendSizeEvent a generic implementation. It can be useful on
non-MSW platforms as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:20:01 +00:00
Vadim Zeitlin
9ae8168e5b removed OnCtlColor()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:05:12 +00:00
Vadim Zeitlin
9f368d0d59 removed (unused) nCtlColor parameter of OnCtlColor()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:04:09 +00:00
Vadim Zeitlin
195df7a767 added tests for setting fg/bg colours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:03:04 +00:00
Vadim Zeitlin
21db32c129 added GetCurrentPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 18:57:53 +00:00
Vadim Zeitlin
01c500af65 removed (unused) nCtlColor parameter of OnCtlColor(); added MSWControlColor(); implemented it to use tab control background if applicable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 18:37:42 +00:00
Vadim Zeitlin
caf95d2aef added support for drawing themed background: DoEraseBackground() and GetThemeBackgroundBrush()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 18:36:45 +00:00
Vadim Zeitlin
8a462d4ee1 added GetIfActive() method returning non-NULL engine only if themes are not only available, but really use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 17:17:00 +00:00
Vadim Zeitlin
6e9324fc52 removed duplicated code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 16:49:15 +00:00
Vadim Zeitlin
978bb48f35 added CompatibleBitmap wrapper class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 16:47:51 +00:00
Włodzimierz Skiba
06aa40d92c Do not make bitmap buttons with standard width (like in wxComboBox drop down button).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 15:55:24 +00:00
Ryan Norton
3f5ca6b1c3 part of patch [ 649438 ] Bug fixes from Netscape/AOL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 07:46:34 +00:00
Ryan Norton
57ac1a563e patch [ 762159 ] scroll sample auto-scroll test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 07:16:40 +00:00
Ryan Norton
71f2fb52d5 Enable stl compilation with wxMac - unicode no work on 10.2 though. Modded patch 1051991.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 06:57:02 +00:00
Stefan Csomor
ee9a28abee apparently this code might be called with a CFSocket not yet constructed, guard against NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 06:34:47 +00:00
Václav Slavík
9755e73bd9 applied modified patch with native GTK wxFileDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 00:30:24 +00:00
Vadim Zeitlin
38c58c778d don't erase background in wxControl neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 23:20:10 +00:00
Vadim Zeitlin
17bcd9a6b5 set background style to wxBG_STYLE_COLOUR in SetBackgroundColour()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 22:32:52 +00:00
Václav Slavík
ffa762ff49 fixed libgnomeprint check to fail if libgnomeprint is too old
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 21:09:54 +00:00
Ryan Norton
e06cac589d [ 1067084 ] fs_zip.cpp assertion fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 17:03:02 +00:00
Ryan Norton
9de05dfd08 fix compilo pointed out by OW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:49:11 +00:00
Ryan Norton
984b0d8ba7 get rid of singleCustomColour - its not needed. Cleanup/optimize a bit more.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:35:16 +00:00
Ryan Norton
dc2ee831d3 fix bug where color chosen by sliders wouldn't be registered. Optimized a bit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:24:11 +00:00
Ryan Norton
1e72e3cc53 fix dialogs sample to remember last color with generic color dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:20:04 +00:00
Ryan Norton
40210d8a0a Add wxSizerFlags docs to wxSizer, wxSizerItem and wxSizer overview.
Mention that wxSizerFlags is PRELIMINARY.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 15:26:26 +00:00
Ryan Norton
f2fe4f6777 wxSizerFlags name fix, accessors only available to wxSizer (supposively :))
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:58:52 +00:00
Ryan Norton
2a3c8b658d wxsizerflags docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:52:04 +00:00
Robert Roebling
0be7709e71 Added support for native print preview (GNOME)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:45:40 +00:00
Ryan Norton
ae4bd80aa0 moved verbose changes to manual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:15:48 +00:00
Ryan Norton
499e521b7b Add incompat and depre changes to manual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:15:07 +00:00
Ryan Norton
0d2b62c57b fix various latex errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:14:43 +00:00
Ryan Norton
717ba4898b fix underscore errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:07:49 +00:00
Robert Roebling
f1c72f0ca0 Implemented DoDrawRotatedText() by way of a
rotation of a alpha blended text bitmap.
    It would be better if Pango could draw
    directly into an wxImage (as FreeType)
    can, but that is for later..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:04:30 +00:00
Robert Roebling
6408deedee Added support for alpha channels in interpolated
and non-interpolated image rotation.
  Added helper method for turning shades of grey
    into shades of alpha and a colour.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 14:01:45 +00:00
Włodzimierz Skiba
415a0ff16d 3rd state in checkboxes for wxUniv [closes bug#1040585].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 13:16:41 +00:00
Václav Slavík
6ff734acec reverted DrawRotatedText change, it's broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 10:30:22 +00:00
Julian Smart
5117f9bfae Null m_select_me when this item is deleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 10:02:56 +00:00
Stefan Csomor
1ad48afbfd avoid locale that always returns US-ASCII on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 09:50:11 +00:00
Ryan Norton
18f8d06335 fix initial color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 08:36:25 +00:00
Włodzimierz Skiba
0bcf9597ab Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because GUI builds are not influenced (but makefiles minimally changed).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 08:14:18 +00:00
Robin Dunn
62038e5976 StandardPaths updates. Added a demo sample for StandardPaths. Made
the Python install prefix be the default install prefix for
StandardPaths.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 01:28:18 +00:00
Robin Dunn
e7e14318e7 Added wxBU_ALIGN_MASK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 23:50:46 +00:00
Robert Roebling
c874715013 Start for Pango 1.6 based text rotation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 21:57:16 +00:00
Robert Roebling
b199de5962 Added support for most print page/selection/copies
etc. options in the native GNOME dialog.
  Added support for printing rotated text and alpha
   channel images.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 21:56:02 +00:00
Stefan Csomor
8f7d7be817 added unix/stdpaths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 18:38:10 +00:00
David Elliott
e2eafeff03 Implement toolbar tool clicks. Get rid of wxNSActionCell stuff because
Cells send their action from the view anyway so we'd have no way of knowing
which tool was clicked.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 18:02:56 +00:00
Robert Roebling
2934005d7d Use native printing dialog for wxPrintDialog,
not for setup only as before. It prints,
    but page selection etc. is still an idea


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 16:59:50 +00:00
Włodzimierz Skiba
ecae80b250 Typecast before endian adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 16:36:28 +00:00
Włodzimierz Skiba
26481315da Several casts due to assigning signed to unsigned or more to less bits of integral values.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 16:13:29 +00:00
Włodzimierz Skiba
682f3d0207 Typecast during compilation instead of class constructor call (OW warnig fix).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 16:11:08 +00:00
Stefan Csomor
f3660dcb2f wxStat call preliminary fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 15:16:58 +00:00
Stefan Csomor
d5c8817ce5 file name char set string conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 15:14:35 +00:00
Julian Smart
22cfea03b8 Added IsTopLevel() check to last message loop in PreProcessMessage. This
stops e.g. ESC being processed by a parent modal dialog if not processed
by the child -> assert and lockup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 13:42:14 +00:00
Vadim Zeitlin
a1d47842fc fixed static libs detection (shouldn't suppress stdout, just stderr)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 08:57:09 +00:00
Ryan Norton
e0d8c923f5 who knows, maybe this will fix the 10.3 problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 07:39:21 +00:00
Kevin Hock
2304e5c9a1 Added archive.h to list of headers, put archive.cpp in alphabetical order, but did not rebake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 02:47:32 +00:00
Kevin Hock
e4899fd770 Fix tree control focus issues on OS X (and possibly others) caused by toplevel.cpp not giving focus if children eat the LEFT_DOWN event... added event.Skip() on LeftDown() (whether an item is hit or not) after all dragging and moving conditions have been considered so that LEFT_DOWN events are never eaten by the tree preventing receiving focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 02:33:58 +00:00
Robin Dunn
b50732d9c4 commented out dbg message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 21:01:12 +00:00
Julian Smart
caf6f46899 Wrapped two generated literals in _T
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 20:49:58 +00:00
Julian Smart
f6bb64a625 Doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 20:48:11 +00:00
Stefan Csomor
fe4fcb5f4f somehow commit did not work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 20:08:25 +00:00
Ryan Norton
551caf8ba3 missed commit files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 16:41:11 +00:00
Ryan Norton
4e69ff2268 makefile regen, include fix, duplicate file fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 15:53:38 +00:00
Ryan Norton
356c775fcf cleanup OSX native font dialog stuff a bit (it should prob. be an option in configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 14:36:10 +00:00
Ryan Norton
3582fcbc09 files for native font dialog on mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 14:19:03 +00:00
Włodzimierz Skiba
e7a3a5a51b WinCE fix. IsEmpty() -> empty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 13:56:18 +00:00
Włodzimierz Skiba
e207252560 WinCE correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 13:54:33 +00:00
Włodzimierz Skiba
4dca492943 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 13:52:47 +00:00
Włodzimierz Skiba
599132d33a eVC3 media fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 13:51:16 +00:00
Włodzimierz Skiba
226ec5a71a Define wxMediaEvent before it is used. Make OnMediaFinish compatible to wxObjectEventFunction. Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 13:49:27 +00:00
Vadim Zeitlin
00ba414f7f attempts to suppress C4702 for VC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 12:09:17 +00:00
Vadim Zeitlin
fcbe123e48 added operator>>(wchar_t)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 12:07:03 +00:00
Vadim Zeitlin
bcb251a0c1 small optimization for wxTextCtrl (forgot to commit with textctrl.cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 12:06:02 +00:00
Vadim Zeitlin
b9691677a0 made default background colour BTNFACE (so that panels don't have to erase their background explicitly); removed now unneeded SetBackgroundColour() in wxDialog which now has default bg colour and restored one in wxFrame which now has a non default one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 12:00:51 +00:00
Václav Slavík
c643a97740 fixed wxEncodingConverter-base wxCSConv to report failures as expected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 11:58:56 +00:00
Václav Slavík
02c92ad972 modified wxEncodingConverter API to report failures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 11:58:24 +00:00
Vadim Zeitlin
838518be7e suppress output of wx-config --static to fix problems introduced by wx-config rewrite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 11:56:52 +00:00
Vadim Zeitlin
d7c65934e6 removed unused variable to suppress warning (and put a TODO in place)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 11:30:15 +00:00
Stefan Csomor
393b27add0 onsize event not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 06:04:59 +00:00
David Elliott
b9d84e4c06 Prevent crashes in wxFFile(Input|Output)Stream: Do not call Eof() or Error()
without first checking IsOpened().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 03:15:00 +00:00
David Elliott
f12a90c7c2 Use wxUint16 instead of WORD and wxUint8 instead of BYTE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 20:51:05 +00:00
Stefan Csomor
4b8f2c2b5f changed fonts on OSX to use OSX system fonts having the full Unicode Tables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 20:25:18 +00:00
Stefan Csomor
b07760f1b6 adapted to current filelist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 19:50:58 +00:00
Stefan Csomor
28997d375d correcting include type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 19:29:51 +00:00
Vadim Zeitlin
658f53c700 set bg style to custom as we overwrite it anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 19:20:47 +00:00
Vadim Zeitlin
6421119dd5 fixed XP sash rendering to really do something (using REBAR style didn't work but it was hidden because background was erased anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 19:17:45 +00:00
Vadim Zeitlin
b8335252d2 don't draw background at all if bg style is custom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 19:15:53 +00:00
Vadim Zeitlin
caea50acee removed unnecessary (now that we leave Windows paint background itself) SetBackgroundColour() calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 18:22:11 +00:00
Vadim Zeitlin
8681b0940e restored OnEraseBackground(), we do need it but only for the cases when the window has a non default background colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 18:10:48 +00:00
Włodzimierz Skiba
547e2b0c43 wxDC::DrawLabel documented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:58:32 +00:00
Włodzimierz Skiba
0d28c9eb31 Order fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:57:05 +00:00
Włodzimierz Skiba
9a431f4d03 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:40:00 +00:00
Włodzimierz Skiba
0de6678dd2 wxUniv actualization.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:38:05 +00:00
Włodzimierz Skiba
7166a05d7e Vertical tabs orientation in gtk renderer of wxUniv.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:33:59 +00:00
Julian Smart
c988c5b21b RC parse fixes from Michael Shamgar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 17:11:37 +00:00
Vadim Zeitlin
1946085a4c added \deprecated command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 14:44:39 +00:00
Vadim Zeitlin
e2c49e5cd2 don't always erase the background ourselves as this is incompatible with XP themed appearance (replaces patch 1046164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 14:43:51 +00:00
Vadim Zeitlin
5886b072a8 fixed va_copy test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 13:46:33 +00:00
Włodzimierz Skiba
00e086a7f0 Partial fix to bug #1040607: support for vertical orientation in win32 renderer of wxUniv notebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 11:25:13 +00:00
Václav Slavík
5d7457f9ca fixed to work with themes that redefine icons (e.g. Fedora's Bluecurve)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 11:15:08 +00:00
Václav Slavík
862f336798 updated to be in sync with wxwin.py code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 09:07:46 +00:00
Ryan Norton
9cc7318052 fix buglet wxKeyEvent->wxMouseEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 07:44:22 +00:00
Ryan Norton
ed5f2bd879 fix technical accuracy of statement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 07:20:35 +00:00
Ryan Norton
78450975b2 WXUNUSED warning fixes - unicode compilo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 07:18:22 +00:00
Włodzimierz Skiba
c16ab217c1 Wise path to generic dialogs sources.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 07:08:47 +00:00
Ryan Norton
876f6cee1f fix for [ 1066432 ] wxTextOutputStream: endl doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 06:59:44 +00:00
Włodzimierz Skiba
041ae20237 wxUniv use wxBU flags [bug #1040584]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-15 06:23:57 +00:00
Ryan Norton
fa9ad408a1 generate mediaplayer sample in configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:43:32 +00:00
Václav Slavík
32efded3f9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:34:36 +00:00
Ryan Norton
db55c58fa8 doc for mediaplayer sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:33:12 +00:00
Ryan Norton
ff4aedc554 Massive reworking of wxMediaCtrl code - backend everything, search for backends via RTTI lookup, and more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:26:55 +00:00
Ryan Norton
6f4a67aca8 doc update for wxMediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:13:18 +00:00
Václav Slavík
1abedc328b fixed rendering of bitmaps with alpha channel under GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 23:03:51 +00:00
Václav Slavík
1df61962e8 added system colours and fonts support to XRC (based on patch #1038207)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 21:53:51 +00:00
Robert Roebling
66266922ca The wxGNOME whitepaper-to-be.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 21:52:55 +00:00
Ryan Norton
6fb603d745 spelling/grammer (lol) :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 16:56:29 +00:00
Václav Slavík
b1d547ebc5 made wxMBConv_iconv MT-safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 10:52:17 +00:00
David Elliott
1e9e8aba5a Rebaked and autoconfiscated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 06:53:06 +00:00
David Elliott
0334f97f9c Moved some OS X only files into MAC_OSX_SRC from MAC_SRC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 06:51:16 +00:00
David Elliott
031e91607b Added Mac OS support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 06:47:58 +00:00
David Elliott
6ff53182ef Reran aclocal using bakefile.m4 from Bakefile CVS HEAD. This adds support
for MacOS and BeOS and includes some other fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-14 05:02:17 +00:00
Robin Dunn
070c48b4c0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 03:24:21 +00:00
Robin Dunn
a68b8331cb reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 03:01:02 +00:00
Robin Dunn
69b6d63d01 the python2 check is gone, take out the use of the flag too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 03:00:09 +00:00
Robin Dunn
66b50a8ff9 bump subrelease
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 02:55:07 +00:00
Robin Dunn
c1cb24a460 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 02:40:46 +00:00
Robin Dunn
6b9f434ef3 * wxPrintDialog no longer derives from wxDialog.
* Add wxRTTI info for wxPyPrintout
* wxPrintFactory probably doesn't need to be exposed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 02:30:14 +00:00
Robin Dunn
7b8a9da3c8 Fix for uninitialized pointer access from wxPrintData's copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 02:26:20 +00:00
Robin Dunn
d4808d76f9 The assumption that if SIZEOF_INT is defined then SIZEOF_SIZE_T is too
is not always true.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-13 02:24:35 +00:00
Václav Slavík
c263eb0384 more wxPostEvent MT fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 21:44:26 +00:00
Václav Slavík
281818319b removed unused static variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 21:43:25 +00:00
David Elliott
fc480dc16b Moved wxStandardPathsCF into base library when using CarbonLib or Darwin.
Make wxStandardPathsBase::Get() return a wxStandardPathsBase reference.
Implement it using wxAppTraits::GetStandardPaths() which is overridden by
wxMac and wxCocoa GUI libraries to return a reference to a wxStandardPathsCF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 21:21:00 +00:00
Robin Dunn
b7a2ebe671 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 20:38:16 +00:00
Robin Dunn
91ce910234 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 20:34:57 +00:00
Robin Dunn
ab897a69db Reset LC_NUMERIC to "C" for Python < 2.4. This fixes Python's float parser.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 18:12:49 +00:00
David Elliott
6a91f7142d Fix build on platforms without any real source in the new media library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 15:48:10 +00:00
Julian Smart
484149522d Notebook page bitmaps now supported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 15:28:48 +00:00
Włodzimierz Skiba
2e0ef2ae56 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:36:46 +00:00
Włodzimierz Skiba
954ec2763a MinGW fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:26:31 +00:00
Włodzimierz Skiba
ceefc965f9 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:23:02 +00:00
Włodzimierz Skiba
79911be138 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:15:30 +00:00
Włodzimierz Skiba
9386cb75e3 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:08:31 +00:00
Ryan Norton
9777274a4a fix for when zlib is not compiled in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 14:05:24 +00:00
Ryan Norton
e6b9f9556c media proj
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 13:09:53 +00:00
Ron Lee
0210f37397 Tagged DEBIAN_2_5_3_2 for release testing. Bumped subversion to 2.5.3.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 13:09:09 +00:00
Ryan Norton
b46f913bee don't include strmiids.lib as its not needed by default anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 13:03:02 +00:00
Włodzimierz Skiba
cf2372509c dwCallback if DWORD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 12:37:39 +00:00
Ron Lee
e653e18150 Bump WX_CURRENT back to 3, this must stay the same as
wx_release_number until bakefile is fixed to unlink the
the soversion from it.  Ideally of course it should track
binary incompatible releases instead.

Update the Debian scripts to suit the new site-packages
location for wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 11:39:03 +00:00
Ryan Norton
e05928eb5b fix hiding the other (mac) one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 10:23:22 +00:00
Włodzimierz Skiba
a418b1f3a2 Fix hiding wxMediaEvent::Clone().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 10:13:04 +00:00
Ryan Norton
cbfb8fe75a explanation of getdefaultattributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 10:05:13 +00:00
Ryan Norton
7a5cebca9b spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 09:53:47 +00:00
Ron Lee
72259e0063 wxUSE_POSTSCRIPT is not a sufficient test by itself for
wxPostScriptPrintNative data.  This is probably still not
100% correct but at least msw builds again for mingw now.

Fixed bogus eof (and removed junk whitespace) from mediactl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 06:52:19 +00:00
Ryan Norton
33d8e2fcb6 mingw evidently doesn't have digitalv.h according to mmedia sources - post a workaround
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 06:35:09 +00:00
Ryan Norton
5987f174f7 workaround to call directshow drivers without actually using directshow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 06:29:08 +00:00
Ron Lee
6d3b231a02 Move stdpath into base on msw as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 05:50:08 +00:00
Ron Lee
f8a586e08e Cruft cleanup from MJW, strip the tabs out of sound.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 03:30:07 +00:00
Ron Lee
d51253e844 Patch from MJW for ssize_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 03:06:44 +00:00
Robin Dunn
369b9aad15 Not sure how you can print audio, so I expect that this was a typo. ;-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 01:16:14 +00:00
David Elliott
0ec6ec3266 Removed the rest of the include. Thanks Robin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 23:30:21 +00:00
Robin Dunn
ed9e79665c Removed the "include/" from the corefoundation headers in files.bkl so
they will actually get installed.  I expect that the other "include/"
prefixes need to be removed too but I left them in case I am wrong.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 21:33:34 +00:00
Robin Dunn
bc37bfe2ee Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 20:58:44 +00:00
Vadim Zeitlin
4626345596 fixes to ZIP/archive patch (patch 1064426); should fix the docs build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 19:10:35 +00:00
Vadim Zeitlin
ee1025a7e0 ensure that g_timerMap is always initialized before it is used (patch 1060619, bug 1060591)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 19:08:15 +00:00
Vadim Zeitlin
b11dd16306 fix reading beyond the end of the string if the last string character is a backslash (patch 1059846; bug 1059848)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 19:01:53 +00:00
Vadim Zeitlin
81152407d0 removed 2.0 compatibility stuff (patch 1054261)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 18:59:51 +00:00
Ryan Norton
16ca2e0fac add directshow define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 15:59:49 +00:00
Ryan Norton
8bf57c4f2e turn off directshow by default for lib dependancy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 15:26:04 +00:00
Ryan Norton
7192290794 mci can't play video on win2k - disable for now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 15:20:34 +00:00
Ryan Norton
e4b12a53fe tweak stopping - nicen up sample some more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 15:18:18 +00:00
Ryan Norton
212945de56 fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 15:17:35 +00:00
Ryan Norton
7e4a1c28d5 correctly generate wxUSE_MEDIACTRL define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 14:43:50 +00:00
Ryan Norton
a2d9b7d02e clean up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 14:14:12 +00:00
Ryan Norton
3f9a3bf9df mci backend for wxMediaCtrl. Better workaround for refresh issue and sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 14:06:45 +00:00
Vadim Zeitlin
523977f752 file not needed any longer after ZIP r/w patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 11:08:17 +00:00
Ryan Norton
d0b9eaa209 comment/explain a lot
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 09:56:45 +00:00
Ryan Norton
39c5bef057 1) fix border styles in wxMediaCtrl, 2) regenerate wx and mediaplayer samples bakefiles, 3) add sample makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 09:32:49 +00:00
Ron Lee
1370b1d016 gcc < 3.4 warns about friendless private dtors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 08:58:27 +00:00
Ryan Norton
0b9cd93cad fix unsigned/signed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 08:30:04 +00:00
Ryan Norton
e854db32dd fix some comp errors on DMC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 08:29:43 +00:00
Ryan Norton
1746bcc5ff get rid of error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 08:06:20 +00:00
Ryan Norton
d2dfcfabf2 more setup changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 08:02:12 +00:00
Ron Lee
a9decf2374 Remove a(nother) guaranteed build failure until what is it testing
for actually exists..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 07:26:54 +00:00
Ron Lee
a98bf0c0df I really don't have to point out what went wrong here, do I?
Ryan, please fix this problem at the source, this is not funny
anymore.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 07:16:28 +00:00
Ron Lee
3b57de8b1f Fixes for wxPython site-packages location.
Fixed and baked unchecked mediaplayer.bkl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 07:00:51 +00:00
Ron Lee
348f211c7e Does \deprecated exist outside doxygen?
tex2rtf doesn't seem to like it right now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 07:00:11 +00:00
Ryan Norton
35b5814155 directshow checking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 06:17:14 +00:00
Ryan Norton
3549217b24 ckconf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 06:00:32 +00:00
Ryan Norton
c8a50408fb setp.h changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:58:40 +00:00
Ryan Norton
103e759554 configure changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:44:57 +00:00
Ryan Norton
eaf0d558dc media sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:40:58 +00:00
Ryan Norton
c5550b7551 prelim docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:37:05 +00:00
Ryan Norton
2ae3b602b1 media lib bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:30:21 +00:00
Ryan Norton
1a680109ac base wxMediaCtrl files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 05:21:02 +00:00
Ron Lee
17a7bf57f8 Added gnome files to gtk dist.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 04:51:25 +00:00
Robin Dunn
d3b6e4ff11 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 02:34:01 +00:00
Robin Dunn
2cbbc68d20 Bump subrelease number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 02:28:29 +00:00
Robin Dunn
7aada1e05a Lots of tweaks and additions to get caught up with CVS HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 02:27:12 +00:00
Robin Dunn
5311274387 Added wxStandardPaths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 02:26:18 +00:00
Robin Dunn
f68535b0a7 Fix compilation error by #including imaglist.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 00:22:44 +00:00
Vadim Zeitlin
00375592f9 added ZIP classes by M.J.Wetherell (patch 1030239)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 23:58:38 +00:00
Vadim Zeitlin
eabd333355 fixed creation of the mask in wxImage -> wxBitmap conversion when bpp < 32 (patch 1052766)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 23:30:57 +00:00
Vadim Zeitlin
308bb56fd8 use TB_GETMAXSIZE in GetBestSize() (patch 1050045)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 23:12:44 +00:00
Kevin Hock
d644ee7ee9 Correct typos, minor wording improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 22:46:50 +00:00
Vadim Zeitlin
db1d019338 better (more precise) values for wxGetOsDescription() (patch 1047539)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 22:08:37 +00:00
Włodzimierz Skiba
3e5f6c1c4f Patch 1053127 - Test fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:29:08 +00:00
Vadim Zeitlin
8e5c652190 construct icon from wxIconLocation, not just the file name without index: this fixes icons display under MSW (replaces patch 1047225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:16:44 +00:00
Kevin Hock
cea15ffc7e Clarified the wording for the return value of count
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:16:33 +00:00
Vadim Zeitlin
588066b7a3 replaced wxStream::GetSize() with GetLength() (still keep the former but it will be deprecated) (second part of patch 1063498)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:10:30 +00:00
Vadim Zeitlin
30984deafc new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:02:58 +00:00
Robin Dunn
ccfc3219db When using an external scrollbar ensure that the built-in one is set
at minimal values so it won't be displayed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:58:49 +00:00
Włodzimierz Skiba
c34924f7bc OW fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:54:00 +00:00
Kevin Hock
c0f62256f5 Fixed two instances of : inbetween wxRect and method name (Inside and Intersects), replaced with ::
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:32:18 +00:00
Włodzimierz Skiba
0cd936a4fb wxTreeEvent::Clone() support [patch #1061198].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:24:22 +00:00
Włodzimierz Skiba
2549081bd9 Patch #1053364 - combobox shoult not remember position after clearing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:17:40 +00:00
Włodzimierz Skiba
5d631b78f8 Warning fix observed in tex2rtf.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:12:34 +00:00
Włodzimierz Skiba
a0177486d3 Explain supressed warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:06:24 +00:00
Włodzimierz Skiba
1b4e1b3ad6 Missing parts of wxDateTime - bug #825215.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:01:43 +00:00
Włodzimierz Skiba
c87957c2db IsSubMenu() not listed - bug #921648.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 18:59:25 +00:00
Włodzimierz Skiba
2585f54330 Fixes to recently added documentation of wxPasswordEntryDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 18:51:22 +00:00
Robin Dunn
2268569346 Fixed GetSaveData and SetSaveData in wx.lib.multisash to not depend on
the default way that class objectss are converted to strings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 18:16:31 +00:00
Robin Dunn
ca8071ca9f OGL patch from Shane Holloway:
Two simple problems found in the new python ogl code.  First is
    the patch for _canvas.py.  Essentially:

        dx = abs(dc.LogicalToDeviceX(x - self._firstDragX))
        dy = abs(dc.LogicalToDeviceY(y - self._firstDragY))

    was incorrect because (x,y) and (self._firstDragX,
    self._firstDragY) are both already in Logical coordinates.
    Therefore the difference between the two is also in logical
    coordinates, and the conversion call is an error.  This bug
    surfaces when you have OGL on a scrollwin, and you are far from
    the origin of the canvas.

    The second change in _composit.py basically removes the assumption
    that the child is in both self._children and self._divisions.
    Causes many problems when it's not.  ;)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 18:14:45 +00:00
Ron Lee
b40a6748eb This size/offset stuff is a mess, but leaving this one warning
about a mismatch that makes the test a NOOP is just silly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 14:37:55 +00:00
Ron Lee
54e83ca581 Added wx.manifest to the msw source dist, it seems to be necessary now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 13:52:51 +00:00
Stefan Csomor
8623a8838d text attributes corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 13:44:51 +00:00
George Tasker
e689d52ab5 wxChar* usage changed over to wxString in various places
Warning fixes when compiling in compatibility 2_4 mode to force use of the desired wxDbTable constructor
Added OnDClick() event to listbox to auto-click the OK button to select a name
Unicode fix of a SQL_C_CHAR reference


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 12:19:55 +00:00
George Tasker
c3677ad324 wxChar* usage changed over to wxString in various places
Warning fixes when compiling in compatibility 2_4 mode to force use of the desired wxDbTable constructor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 12:12:37 +00:00
George Tasker
4e8f1c6dba Correction of a commented out line of code so that if ever uncommented, it will work in unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 10:31:13 +00:00
George Tasker
5a349c39a0 Added support for SQL_C_UCHAR (unicode builds), SQL_C_LONG, and SQL_C_SHORT. These are the column types supported by the wxODBC classes that were not being handled by the wxDbGrid code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 10:29:37 +00:00
Ryan Norton
aa3698d5d0 fix datetime tests for non-westeurope time zones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 09:31:13 +00:00
Ron Lee
d9809627ad Don't shoot the messenger. Reverted the previous 'silent treatment' patch,
users should be informed of things that go wrong, when they go wrong, without
having to figure out what cold silence means in that context from other clues.

If broken configure scripts perform unnecessary tests, or clever ones want
to perform them silently, then they should redirect stderr to /dev/null like
all other well behaved tools might.

Fixed bug diagnosed by Fritz Elfert where an explicit --host specification to
configure was not properly ignored for native builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 05:01:23 +00:00
Robin Dunn
06759a389d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 00:53:10 +00:00
Robin Dunn
9dcf02b4e2 typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 00:33:04 +00:00
Stefan Csomor
5a486641eb toplevel creation respecting wxDefaultPosition again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 20:03:19 +00:00
Vadim Zeitlin
e51b17a1f9 don't define comparison operators for wxString and wx[W]CharBuffer when wxUSE_STL == 1 neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:35:33 +00:00
Włodzimierz Skiba
c3d02b6843 Removed method which belongs to wxArrayString (and is listed there already) [Bug #957545].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:32:55 +00:00
Włodzimierz Skiba
1b392b3a68 Unicode fixes. Avoid int 'ch' and '(wx)char ch' in the same scope.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:17:05 +00:00
Kevin Hock
55b46fd164 [1001483] Added wxPasswordEntryDialog analagous to wxTextEntryDialog, allows detecting entering an empty string vs. cancel unlike the wxGetPasswordFromUser dialog function.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:13:15 +00:00
Kevin Hock
12cfa30457 [1001483] wxGetPasswordFromUser now uses wxPasswordEntryDialog instead of wxTextEntryDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:09:58 +00:00
Włodzimierz Skiba
4cee05ac00 Doc fix [Patch #1048940].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:09:13 +00:00
Kevin Hock
5e2db64247 [1001483] Added default prompt for new wxPasswordEntryDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:03:17 +00:00
Kevin Hock
e9f4948e73 [1001483] Added wxPasswordEntryDialog analagous to wxTextEntryDialog, allows detecting entering an empty string vs. cancel unlike the wxGetPasswordFromUser dialog function.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 19:01:47 +00:00
Włodzimierz Skiba
97035e2c0b Supress 48 warnings in wx\msw\uxtheme.h: 'va_start' macro will not work without an argument before '...'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 18:53:23 +00:00
Włodzimierz Skiba
bb8a847812 Warning fixes, IsEmpty->empty.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 18:48:38 +00:00
Włodzimierz Skiba
56eee37fc8 wxSizer::Add/Insert now returns pointer to wxSizerItem added and wxSizerItem contains access to its area [Patch #1042571 with minimal tweaks]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 18:33:00 +00:00
Robin Dunn
48023e151f Backed out Oliver's PyPlot changes at Gordon's request.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 18:03:21 +00:00
Václav Slavík
c33230b1c1 memory corruption fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 11:02:58 +00:00
Václav Slavík
6b7d5d1c44 fixed memory deallocation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 10:29:47 +00:00
Stefan Csomor
507ad4266a move offscreen before in order to avoid transitions for mdiparent frame as it supposed not to be visible on mac anyway
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 08:13:00 +00:00
Stefan Csomor
ed2c31509f allow arbitrary positions for toplevel windows (also initially off-screen )
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 08:02:40 +00:00
David Elliott
f71bb8efc3 Cast 4th parameter of getsockopt to char* and of setsockopt to const char*
so that older headers such as those found on Solaris 2.6 will work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 04:20:38 +00:00
Robin Dunn
9e9c7a1525 removed RC flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 03:41:31 +00:00
Robin Dunn
2b00444c2b typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 03:41:00 +00:00
Robin Dunn
dc5bee0a15 Can't use the config.PYVER value if it hasn't been set yet...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 03:40:11 +00:00
Robin Dunn
2c12daf99b return error code upon KeyboardInterrupt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 03:39:32 +00:00
Ryan Norton
ca269f77a4 remove fixme and explain unicode characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 03:22:56 +00:00
Robin Dunn
df6dc8d09b oops, set coLinux hosts for the other Jobs too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 00:09:25 +00:00
Robin Dunn
1a084a3c2f corrected function name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 23:59:44 +00:00
Robin Dunn
e4bb599887 Revamped automated build system to use a Python script for the master
control script, make parallel builds the only way to do it
(facilitated by the taskrunner module) split out the guts of build-all
into separate scripts, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 23:55:25 +00:00
Włodzimierz Skiba
17dc7ddd7c Remove unnecessary OW recognition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 21:27:30 +00:00
Robin Dunn
a74ed7047f Python App bundles built on Jaguar won't run on Panther because of the
different paths to the Python.app so we need to differentiate the two
builds for the docs-demo disk image.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 21:24:41 +00:00
Robin Dunn
3249a43c96 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 21:23:08 +00:00
Włodzimierz Skiba
21f8cd6f8b Blind change following observation in wxTextCtrlBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 20:03:12 +00:00
Włodzimierz Skiba
4e4528f6a5 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:57:37 +00:00
Włodzimierz Skiba
3f0785de9a Get shorter code with new wxRect constructor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:54:24 +00:00
Włodzimierz Skiba
fd864f01f2 Unused warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:51:55 +00:00
Włodzimierz Skiba
6356d52a67 Unfortunatelly compiler does not know which bits play here and still warns about loosing them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:34:45 +00:00
Włodzimierz Skiba
048ba49d87 OW prototypes does not use ints in Unicode.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:27:13 +00:00
Włodzimierz Skiba
216289a24a Undef GetWindowStyle() after new #include in cmndata.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 19:20:28 +00:00
Vadim Zeitlin
b6339dde8c don't define comparison operators taking wxStrings when wxUSE_STL == 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 18:19:13 +00:00
Vadim Zeitlin
abb9aae7ac use wx_release_number instead of WX_CURRENT in Mac .r and .rsrc file names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 17:17:04 +00:00
Vadim Zeitlin
1d6560d796 reverted last commit, still broken for VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 14:43:04 +00:00
Vadim Zeitlin
bd4ed40fed fail silently if the requested wx-config is not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 14:37:20 +00:00
Vadim Zeitlin
d1c3880801 regenerated (fixes problem with undefined EXTRALIBS_GNOMEPRINT)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 14:30:06 +00:00
George Tasker
c906510440 Unicode corrections in new SqlExec() overload
SQL_BIT and SQL_TIMESTAMP were not being correctly interpreted in ::GetColumns()
Source reformatting to match WX conventions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 12:21:09 +00:00
Ryan Norton
d34fb3b8f5 remove docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 07:22:30 +00:00
Ryan Norton
8c98569888 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 05:17:32 +00:00
Ryan Norton
d20c3f4181 fixup authorship
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 04:08:36 +00:00
Ryan Norton
dff4be9392 fix playbackrate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 02:39:00 +00:00
Ryan Norton
51884c2404 finalize MAC implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 02:23:43 +00:00
Ryan Norton
2bff0db15b finalize MSW implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 02:05:01 +00:00
Ryan Norton
79c78d4284 correct to int32 for range comparison
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 00:34:51 +00:00
Ryan Norton
27cfdc97a4 workback defs for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 00:28:36 +00:00
Ryan Norton
990e581091 clean up dust from uri tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 00:23:52 +00:00
Ryan Norton
113e181a8a update msvc projs manually for changed tests and uri tests and rebake others
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 00:17:00 +00:00
Kevin Hock
2456792140 The spacing just isn't right without the 4 pixel border around the textbox part
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 22:22:31 +00:00
Václav Slavík
393103d84d fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 21:34:15 +00:00
Vadim Zeitlin
4c2deb19e0 handle volume part of the path correctly in wxFileName(path, name, ext) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 20:11:42 +00:00
Vadim Zeitlin
2fb5a4ce63 made IsPathSeparator(NUL) work (by returning false)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 20:06:37 +00:00
Vadim Zeitlin
c7a4ae97ed ignore VC7 projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 19:44:17 +00:00
Julian Smart
0b47cf6f35 wxWindows -> wxWidgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 19:20:20 +00:00
Václav Slavík
abda7717b3 use wxART_BUTTON for stock bitmap buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 17:05:27 +00:00
Ryan Norton
16cfbafc6a some setup.h changes for wxMovieCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 15:47:57 +00:00
Ryan Norton
52f2f7b2c1 fix for [ 1052989 ] TextCtrl.SetBackgroundColour(wx.NullColour) bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 14:14:10 +00:00
Ryan Norton
093dee5e9d fix for [ 1055191 ] wxTextCtrl::GetStyle() wrong attr and extended stat bar in text ctrl sample with rich text to show font attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 13:01:59 +00:00
Ryan Norton
7012506a83 quick fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 12:27:05 +00:00
Ryan Norton
3a774635dc allow multiple movie loading as per Julian's suggestion. DOC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 12:22:11 +00:00
Ryan Norton
5687a67ce1 clear up wxStringBuffer docs a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 11:42:51 +00:00
Ryan Norton
aa13eec585 correct Stopping - go to start of movie if stopped - add in preliminary docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 11:34:15 +00:00
Ryan Norton
0568fd59ca add Length, Tell, SetPlaybackRate and GetPlaybackRate - use Connect instead of message maps - on MSW don't assert if the file has no video and only sound - add event for when the movie finishes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 10:56:06 +00:00
Robert Roebling
fe27303f7a Forgot to commit these.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 10:20:14 +00:00
Robert Roebling
0ab2de15cb Moved deletion of wxPrintFacory to module.
Added wxWidgets 2.4 backward comp methods
   to wxPrintData which make use of the
   PostScript native print data if used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 10:11:48 +00:00
Ryan Norton
bcac1ec21b fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 09:04:40 +00:00
Ryan Norton
4ad7af2b83 wxMovieCtrl - for playing movies - mac carbon QT 3 MSW-compatable implementation and MSW DirectX7 directshow implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 08:27:51 +00:00
Kevin Hock
9b621a7f7a EnableEffects added for generic font dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 05:38:58 +00:00
Kevin Hock
8ae6cfb696 Added checking of EnableEffects flag and not allowing changes to color or underlining if it is not set, consistent with MSW (GTK2 native control doesn't offer underlining or color, so flag is essentially always disabled on GTK2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 05:38:02 +00:00
Ryan Norton
8632fc366f change spun via [ 1050204 ] wxFileDialog wildcard filters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 01:11:42 +00:00
Ryan Norton
e3e817d4ac [ 1057587 ] MacOSX build fails with --disable-gauge or --disable-spinbtn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 01:03:08 +00:00
Ryan Norton
24d2b4f5ba fix for [ 1020924 ] wx.Display.IsPrimary is wrong
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 00:48:37 +00:00
Ryan Norton
4cd1ed991c fix for [ 950550 ] wxChoice - wxEmptyString (wxChoice::FindString doesn't work with empty strings) - confirmed on win2k
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 00:09:39 +00:00
Ryan Norton
fde548e2d2 fix for [ 1044879 ] wxMSW 2.5.3: memleaks in listctrl.cpp and bug in listctrl sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 23:49:28 +00:00
Ryan Norton
16c0e7305c fix for [ 1042972 ] Keycodes above WXK_START conflict with unicode characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 23:14:16 +00:00
Stefan Neis
175bb578e0 Added wxStandardPaths implementation for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 22:14:04 +00:00
Ryan Norton
08429a81ca fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 20:39:44 +00:00
Ryan Norton
f110f39530 [ 955006 ] wxDb query with column information (modded to overload instead of creating a new function)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 20:32:34 +00:00
Ryan Norton
f5fb687186 final cleanup of string conversion with null characters (hopefully :))
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 08:23:50 +00:00
Ryan Norton
0c6099b79e Revert files to previous version that were affected by wxIsXXX((wxChar)X) change. Note - passing a negative value to those c lib functions is undefined, and could return true on platforms using a lookup table, for example (might crash also?), which is what will happen when casting to char to ansii mode and a char is above 127
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 07:09:35 +00:00
Ryan Norton
311765c2a8 fixup // comment header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 06:57:24 +00:00
Ryan Norton
3950f9e165 fix warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 06:42:25 +00:00
Ryan Norton
84c51ddf77 rewrite wxGetKeyState a bit, spun from [ 1058347 ] Fixes wxGetKeyState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 06:41:05 +00:00
David Elliott
f1108504ce Use gsockosx.cpp from new corefoundation directory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 06:26:53 +00:00
Stefan Csomor
c020f4210f selection handling for data browser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 06:19:11 +00:00
Robin Dunn
91e57bd14c syntax fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 03:45:48 +00:00
Robin Dunn
eae9a17279 don't use --jobs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 03:45:05 +00:00
Ryan Norton
d8d7193d76 in unescape add normal characters in addition to unescaped characters :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 02:32:51 +00:00
Kevin Hock
57dd96a692 Add ability to position and/or center the dialog for wxGetPasswordFromUser like you can for wxGetTextFrom User (documentation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 02:24:01 +00:00
Kevin Hock
b3bb2a7427 Add ability to position and/or center the dialog for wxGetPasswordFromUser like you can for wxGetTextFrom User
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 02:21:39 +00:00
Kevin Hock
01e1314745 Simplified the wxCENTRE style check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 02:19:33 +00:00
Robert Roebling
04a014a5d6 I admit I have no good solution for wxPrinter::Setup(wxWindow*)
yet. I'd just remove it but I'll think it over if there is
    or was any use for it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 22:25:25 +00:00
Robert Roebling
aac85509bd Mem leaks in connection with print factory code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:33:27 +00:00
Włodzimierz Skiba
32b1391332 Warning fixes to unused variables, int/wxChar keycode and other typecasting, not mixing 'type*' and 'type' variables in single line, IsEmpty to empty replacement etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:18:04 +00:00
Václav Slavík
f7ad3cd30b use wxNewId in wxEditableListBox to avoid conflicts with XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:17:45 +00:00
Václav Slavík
3a3013019a use wxNewId() to implement XRCID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:12:41 +00:00
Václav Slavík
c838b68e83 make sure that wxNewId() doesn't return standard ID's value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:10:45 +00:00
Włodzimierz Skiba
34158fee38 Simplify wxRect construction at the wxPoint(0,0) with given size.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:04:46 +00:00
Włodzimierz Skiba
141f4958e0 OW warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 20:53:23 +00:00
Włodzimierz Skiba
1676a1941a Still needs a typecasting to please warning about loosing bits.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 20:49:37 +00:00
Włodzimierz Skiba
91cf52cec2 We need a char, not wxChar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 20:45:23 +00:00
Włodzimierz Skiba
8d8fbb9d1b Simplify wxRect construction at the wxPoint(0,0) with given size.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 19:54:29 +00:00
Włodzimierz Skiba
142b15c5a1 NULL is not bool.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 19:42:15 +00:00
Stefan Csomor
13220cca72 Faster Deselect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 19:07:22 +00:00
Robin Dunn
8a5d65082d Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 18:38:53 +00:00
Robin Dunn
ecf0b9f982 PyPlot updates from Oliver Schoenborn:
- Factored out "draw command" so extensions easier to implement: clean
      separation b/w user's "draw" (Draw) and internal "draw" (_draw)
    - Added ability to define your own ticks at PlotCanvas.Draw
    - Added better bar charts: PolyBar class and getBarTicksGen()
    - Put legend writing for a Poly* into Poly* class where it belongs
    - If no legend specified or exists, no gap created


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 18:38:04 +00:00
Robin Dunn
1c7da10ebf Only do this Show on wxGTK as it is needed there but can cause display
problems on MSW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 18:30:41 +00:00
Ryan Norton
c3ee1ba683 switch needsfocusrect to hiveiw version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 17:41:34 +00:00
Ryan Norton
6e394fc623 cast fix, workaround for pickeir compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 16:33:47 +00:00
Ryan Norton
59059feb40 rest of 1061091, clean up define a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 16:06:54 +00:00
Václav Slavík
ba0052f3f5 upgraded to zlib 1.2.2 (replaces patch with CAN-2004-0797 vulnerability fix with official upstream fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 15:55:19 +00:00
Václav Slavík
a6285dc957 This commit was generated by cvs2svn to compensate for changes in r30285,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 15:46:58 +00:00
George Tasker
7e961abe12 Updates to reflect changes in db.cpp member variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 14:30:05 +00:00
Stefan Csomor
fe3dc50545 Listbox fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 12:50:51 +00:00
Ryan Norton
c08a36538a fix for [ 1060093 ] wxURI && wxStringBufferLength part 2 - query and fragment not appended to URL in getinputstream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 08:50:30 +00:00
Jouk Jansen
5f81e1e966 Committing in .
Another update of the configurations for OpenVMS

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 08:04:38 +00:00
Robin Dunn
ad65aea843 Some support for parallelizing builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 00:48:54 +00:00
Václav Slavík
606ce80cc8 compilation fix for GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 23:57:19 +00:00
Włodzimierz Skiba
2b9afe407e URL conditional and consistent intendation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:56:29 +00:00
Robin Dunn
b8419d9a8b rpmbuild may not exist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:56:10 +00:00
Robin Dunn
610747464e Use relative paths for inplace builds, it helps ccache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:55:00 +00:00
Włodzimierz Skiba
d37da5efd5 URL test needs net lib.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:54:29 +00:00
Robin Dunn
f290d1c76e Set some minsizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:54:08 +00:00
George Tasker
2db1ecafac wxODBC changes logged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:38:19 +00:00
George Tasker
d73ae65656 Unicode support added
SQL_C_WXCHAR now used throughout the code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:36:32 +00:00
George Tasker
da1e87c4c9 Unicode support added
SQL_C_WXCHAR now used throughout the code
BLOB example added to samples\db


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:35:39 +00:00
George Tasker
e4e4557315 Unicode support
Several error conditions when connecting to databases are corrected


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 21:31:12 +00:00
Włodzimierz Skiba
be7eecf834 Make internal type for ToAscii conversion written once but do not forget all necessary type casts (aka warning fix).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 20:22:44 +00:00
Włodzimierz Skiba
6e36105bda IsEmpty to empty change, warning fix to OW, whitespaces cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 20:12:04 +00:00
Włodzimierz Skiba
53b9981048 Compare and assign wxChars to wxChar instead char local variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 20:09:05 +00:00
Václav Slavík
fe593cc504 (hopefully) fixed race condition in installing idle handler (calling wxPostEvent from non-main thread)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 20:04:59 +00:00
David Elliott
2449852113 Tabs to spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:58:10 +00:00
David Elliott
5d553c56c9 Moved duplicated wxMac/wxCocoa code into src/mac/corefoundation/utilsexc_cf.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:45:42 +00:00
Włodzimierz Skiba
498b94a6e0 Make temporary MSWUniv buildable and mark problem for the future (or for now if the print changes are supposed to be complete).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:13:31 +00:00
Václav Slavík
448c8e496d m_wakeUpTimerTag is not used anywhere, removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:13:07 +00:00
Ryan Norton
409a7ba772 slightly nicer workaround for pickier compiler warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:07:12 +00:00
Włodzimierz Skiba
bf8f21fdf8 Line at the end to please warning generator aka GCC ;)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 19:04:00 +00:00
Ryan Norton
e5c1e110ca remove hack since it doubly-draws focus rects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 18:59:17 +00:00
Włodzimierz Skiba
846978d727 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 18:58:04 +00:00
Włodzimierz Skiba
a12f001e3f 'Unused ...' warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 18:45:02 +00:00
Włodzimierz Skiba
e2c10c59b7 Do not mention MacOS usage in makefiles dedicated to MSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 18:31:20 +00:00
Włodzimierz Skiba
38a8fcc1f8 Fix to broken windows makefiles with ADV lib usage. New line broke linking while all in single line works fine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 17:57:38 +00:00
Václav Slavík
9fbad34ddd don't add empty image to tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 17:53:20 +00:00
Ryan Norton
d21d3f21a2 wxstringbufferlen stl fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 17:51:28 +00:00
Ryan Norton
35b4f9cae1 wxdocmpnocase fixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 17:47:33 +00:00
Jouk Jansen
cc69661552 Committing in .
Update OpenVMS configurations

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 13:57:08 +00:00
Ryan Norton
fd1017cd20 dll dec
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-04 02:58:13 +00:00
Václav Slavík
a78955e377 made it possible to customize wxGenericDirCtrl, such as using checked wxTreeCtrl (patch #1019699)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 23:01:57 +00:00
Robert Roebling
b438278443 Added printing images.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 21:47:55 +00:00
Robert Roebling
e1bf3ad3e8 Applied patch to reorder includes. Not the most
important patch in the world, but still.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 21:13:28 +00:00
Robert Roebling
cd86bf1e7e Forgot to commit header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 20:47:05 +00:00
Robin Dunn
ff0ac6b070 fix typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 17:28:37 +00:00
Robin Dunn
ef407a4e11 bump RC number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 17:27:16 +00:00
Robert Roebling
fa499247cf Corrected typo in font scaling code.
More printing code for GNOME.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 21:21:53 +00:00
Robert Roebling
400be13742 Applied patch to show title bar changes
immidiately in wxMiniFrame


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 19:47:41 +00:00
Robert Roebling
981a6af126 Some more printing code to clear most of
the printing sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 14:32:59 +00:00
Stefan Csomor
c543817b32 wxMax instead of max, former is always around
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 09:36:13 +00:00
Stefan Csomor
db696b6238 correcting allocated buffer size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 09:03:35 +00:00
Stefan Csomor
4d5e2c7dae added corefoundation and base classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 08:35:22 +00:00
Jouk Jansen
7c8fad40bf Committing in .
Patches for OpenVMS

 Modified Files:
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/common/strconv.cpp
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 08:31:08 +00:00
Jouk Jansen
fa06876d15 Committing in .
Patches to compile on OpenVMS

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/src/common/db.cpp
 	wxWidgets/src/common/stream.cpp
 Added Files:
 	wxWidgets/src/xml/descrip.mms wxWidgets/src/xrc/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 07:13:19 +00:00
David Elliott
03ed957a32 Metrowerks CodeWarrior IDE prefix and precompiled header files for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-02 06:22:11 +00:00
Robert Roebling
7b25d8e7bd Adapted printing samples makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 23:07:49 +00:00
Robert Roebling
7fcba069d8 Added gprint.cpp to bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 23:06:30 +00:00
Robert Roebling
58c30cd80c Further compile fixes.
Added module so that linking to GNOME printing
    code will install its wxPrintFactory.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 23:05:24 +00:00
Václav Slavík
f201b1e293 OnGetItemText is const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 21:03:30 +00:00
Robin Dunn
27a345c712 Increment RC number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 19:48:04 +00:00
Robin Dunn
c4ef95daf6 Use a MessagePanel instead of a MessageDialog for samples that may not
be runnable in certain conditions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 19:39:09 +00:00
Robert Roebling
45fb81e556 define EXTRALIBS_GNOMEPRINT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 19:02:11 +00:00
Robert Roebling
7c72311fe1 Added --with-gnomeprint and its wxUSE_LIBGNOMEPRINT
Removed the now obsolete test for FT2 (FreeType)
    which was used by the Pango based printing which
    I removed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 18:40:51 +00:00
Ryan Norton
638357a03e rewrite core foundation conversion to be efficient, double-pass mac WC2MB to verify that there were no invalid characters converted, set amount of memory to allocate to 32 for mac conversion to prevent needless large buffer allocations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 18:03:04 +00:00
Ryan Norton
04fa0af10e warning fix for 10.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 18:03:03 +00:00
Robin Dunn
71c9ea2b9e Avoid the IsVisible assert in GetNextVisible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 17:55:56 +00:00
Julian Smart
780fb83cb0 Fixed bug in setting/getting value for wxComboBox. Read-only status
is taken into account.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 15:58:56 +00:00
Julian Smart
23fba6860a Added missing functions and variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 15:55:14 +00:00
Robert Roebling
2c84e0c259 Added possibility to select a printer reported
by CUPS as a target. Some other corrections.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 15:24:44 +00:00
Robert Roebling
1e6601c72f wxListCtrl::InsertItem() ignored the column.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 12:09:18 +00:00
David Elliott
b48a2016d0 Rebake after MacOS CarbonLib additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 06:00:58 +00:00
Stefan Csomor
9543e985ff switching to defines not having a value for __WXMAC__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 05:57:25 +00:00
David Elliott
7b8609300d wxMac: Rearrange a few things and add support for CarbonLib build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 05:10:02 +00:00
David Elliott
27a17b74f8 Use PLATFORM_MACOS. PLATFORM_MAC is defined for OS X (no good).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 05:02:01 +00:00
David Elliott
c8c1b0bfb1 HACK: Add PLATFORM_MACOS as an option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 04:57:21 +00:00
David Elliott
6b1a8b64f1 Declare namespace std {} before using namespace std; for MetroWerks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 00:38:32 +00:00
David Elliott
e0ea0b7f1c Work around the fact that Metrowerks (CW 8.3) and Apple (10.2.8 sdk) headers
try to detect each other and change their behavior but just wind up screwing
everything up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 00:01:40 +00:00
David Elliott
5f5f809d57 #include "wx/settings.h" wxSystemSettings is needed by non-OSX code.
Typically precompiled headers are used so this hadn't been noticed before.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 23:53:39 +00:00
David Elliott
184213a42a Added src/tiff/tif_apple.c when PLATFORM_MAC==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 23:45:04 +00:00
Robert Roebling
b45dfd0a8b Moved the wxPageSetupDialogData <-> native conversion
code for MSW to the appropriate file in src/msw/printdlg.cpp
  Removed the now obsolete printer setup dialog code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 23:43:41 +00:00
David Elliott
072a99f431 Do not use framework includes in CFM builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 21:46:12 +00:00
Stefan Neis
0f2b2fb811 Removed debug output.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 19:34:31 +00:00
Stefan Neis
d5a547f391 Newest version of script(s) for creating DLLs - now divided in two,
main script takes additional argument for script generating DLL name,
        new script generates DLL names from (too long) library names.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 19:33:07 +00:00
Ryan Norton
ba5a47aed8 because gcc is dumb and can't tell the difference between a std::string and a wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 18:26:03 +00:00
Stefan Neis
eebaafb582 Fixed "pragma interface" handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 18:15:53 +00:00
Robert Roebling
93c2f401e9 Moved print dialog data conversion code
from cmndata to its msw place.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 16:34:02 +00:00
Robert Roebling
53fa663af1 Small change to ease Mac transition to common
native data printing code later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 14:59:11 +00:00
Robert Roebling
f85b45fb12 Copyright notice.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 13:50:09 +00:00
Václav Slavík
9c0a4cb4e1 the position attribute is called 'pos', not 'position'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 11:42:28 +00:00
Václav Slavík
8b34993daa added 'icon' property to wxFrame and wxDialog in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 11:42:27 +00:00
Václav Slavík
db6b57fff5 compilation fixes for gcc-3.4 + Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 08:36:06 +00:00
Václav Slavík
88fd7006f4 fixed spelling of -checkcurleybraces (patch #1054304)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 08:31:03 +00:00
Ryan Norton
fd5e476dbb note broken code, cast hack to fix warning on pickier compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 06:23:16 +00:00
Ryan Norton
dbb6c0a968 fix const error on sane (not msvc) compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 06:13:18 +00:00
Ron Lee
92ea30ce14 Patch from Paul Cornett, clean up side effects in obtaining legacy
config and remove unneccessary line continuations et al.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 05:01:46 +00:00
Ryan Norton
a9e9946154 Rename some tests to avoid conflicts with project builder GUI debugger
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 04:41:27 +00:00
Robin Dunn
72ddfce0dd PNG Alpha is working on wxGTK2 now too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:39:44 +00:00
Robin Dunn
1c39400cd7 tweak the path so ccache is found first on both build machines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:39:03 +00:00
Robin Dunn
67a6f449e1 fixed typo causing a syntax error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:36:54 +00:00
Robin Dunn
c59e73e82d Ensure the first EVT_SIZE has happened before the first EVT_PAINT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:35:54 +00:00
Robin Dunn
0ae3862362 Remove non-ascii characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:33:29 +00:00
Robin Dunn
630edaac3c Use wx.FULL_PAINT_ON_RESIZE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 21:30:16 +00:00
Ryan Norton
997ba01b28 restore ConvertToValidURI to prev. version for bw compat. Note changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 20:22:24 +00:00
Ryan Norton
e4e3bbb447 solution to wxMBConv stuff - make a seperate XX2XX for strings of a specified length, use this in wxString instead of previous worst-case method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 20:16:25 +00:00
Václav Slavík
9026d6fd7f usability improvement: set focus to text control so that the user can directly type directory name instead of using both mouse and keyboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 20:04:16 +00:00
David Elliott
3b01b1fe4c wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 07:41:30 +00:00
David Elliott
294d965baf CodeWarrior (8.3 mwcc) thinks that it cannot compare id (a struct objc_object*)
with NSView* for equality.  This is of course completely against the
Objective-C language specification but we'll fix it anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 06:31:07 +00:00
David Elliott
5447d1e1e3 CodeWarrior (8.3 mwcc) can't figure out that it needs to do C++ automatic
conversion from wxObjcAutoRefFromAlloc<NSButton*> to NSButton* when it is
used as the receiver of a message.  Help it along with a static_cast.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 06:23:38 +00:00
David Elliott
52cbcda351 Declare namespace std {} before using namespace std; for MetroWerks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 06:14:10 +00:00
David Elliott
e73ae7474c Fixed compilation with precompiled headers.
Removed include <objc/objc-runtime.h> from window.mm, it's not needed anymore.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 05:53:33 +00:00
David Elliott
d841895246 CodeWarrior dislikes #include <> syntax for in-tree headers, prefer ""
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 05:41:10 +00:00
David Elliott
c096ba5ea1 Make wxString::WorstEncodingCase take a const wxMBConv&
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 05:33:47 +00:00
Ryan Norton
459c621258 mark incompat and depreciated changes for wxURL, add UTF7 mention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 02:40:59 +00:00
Kevin Hock
052d2fc581 Better alphabetized the event handler macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-30 01:54:17 +00:00
Ryan Norton
15f2ee3270 [ 1054664 ] Implementation of wxMBConvUTF7 (Heavily modified in places), utf7 unit tests change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 22:10:26 +00:00
David Elliott
726b98e9a1 Added wxStandardPaths for wxMac and wxCocoa.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 21:38:33 +00:00
Ryan Norton
03ff8fda8d Add wxString::WorstEncodingCase, other various cleanups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 21:06:28 +00:00
David Elliott
83bd1fd925 Build src/mac/corefoundation/cfstring.cpp and src/common/uri.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 20:22:36 +00:00
Ryan Norton
6cc280ca91 somewhat modded [ 1056879 ] use wxURI::Unescape vs wxURL::ConvertFromURI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 20:19:49 +00:00
David Elliott
e313e308c0 Build the new cfstring stuff for both wxMac (as part of Mac's base) and wxCocoa.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 18:37:41 +00:00
David Elliott
5185263fc5 Moved wxCFStringHolder and some other string functions to their own files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 18:29:35 +00:00
Robin Dunn
9004ba6af3 version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 18:12:00 +00:00
Robin Dunn
59d8365073 Set "rc1" in version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 17:15:16 +00:00
Robin Dunn
38d45b1014 Use $ on variables!!!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 17:14:19 +00:00
Robin Dunn
156fa22b80 Don't just assume that the metadata files will be found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 17:12:59 +00:00
Robin Dunn
75a937411c Save a reference to the async sound object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 16:50:07 +00:00
Julian Smart
89f0d32f7e Use Courier New instead of Courier, to avoid bad characters
appearing in PDF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 15:24:41 +00:00
Ryan Norton
854451e2f8 have wxbuiltin wxmbconvutf7 return -1 (error) not 0. Some cleanups in string.cpp. Add some unit tests for utf7 and cleanups.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 11:13:41 +00:00
Ryan Norton
bdd8f35a58 Handle bad conversions correctly. Add Bad UTF8 test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 10:13:59 +00:00
Václav Slavík
c20d8682bd check if conversion to UTF7 works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 09:29:52 +00:00
Ryan Norton
930357bd25 Handle invalid conversion slightly better, ecapsulate literal chars with wxT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 08:55:58 +00:00
Ryan Norton
6632a38a9b Remove erronues file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 07:16:53 +00:00
Ryan Norton
494b978fc1 add some asserts for wxStringBufferLength
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 05:52:16 +00:00
Ryan Norton
72606b430e increase worst case for UTF8 to *4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 23:05:47 +00:00
Ryan Norton
44d271da3e increase worst case to *4 for UTF8, switch a memcpy for wxMemcpy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 23:01:46 +00:00
Vadim Zeitlin
9266e0ecde undid last change to wxBitmapButton::GetBestSize(), in fact it doesn't make sense to support wxBU_EXACTFIT for it at all, so just removed the code doing it and mentioned it in the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 22:43:14 +00:00
Ryan Norton
ce321570b0 wxURL - doc cleanups, depreciated more methods, more source comments. wxURI - enclosed literal characters with wxT, more source comments, doc cleanups, changed StartsWith(x) to [ou] == x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 22:22:40 +00:00
Robin Dunn
5bb05e6dc6 I think that going to the home page woudl be more user friendly than
to the SF download page, but make it a module attr so the app can
change it if it's really needed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 20:34:52 +00:00
Robin Dunn
7dc107d60c add skipupload flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 20:32:14 +00:00
Robin Dunn
05871e13a0 Use the wx.App.SetMac* static methods instead of the global functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 20:31:34 +00:00
Vadim Zeitlin
97786ab70f fixed wxBU_EXACTFIT handling in wxBitmapButton (closes 1056234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 16:47:39 +00:00
Włodzimierz Skiba
fc1f28995d Missed CanRead and correct type for Eof (bug #983978).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 14:24:43 +00:00
Włodzimierz Skiba
4b4fae9b06 Single section for variants of the same function so it is less confusing for referencing from other parts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 14:22:58 +00:00
Włodzimierz Skiba
aed3141867 Lack of label causes 'topicN' anchors in url and reports warning during tex2rtf execution.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 14:20:10 +00:00
Włodzimierz Skiba
1ccc19ce9d Borland warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:48:32 +00:00
Włodzimierz Skiba
ce403057df Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:43:53 +00:00
Włodzimierz Skiba
bee671476e Warning fix due to unsigned nature of wParam.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:41:35 +00:00
Václav Slavík
c25b742aec FL's floating windows render borders themselves, don't use small titlebars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:20:44 +00:00
Václav Slavík
c4d25c01ae fixed wxTextCtrl::EmulateKeyPress to work in Unicode build of wxGTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:19:39 +00:00
Vadim Zeitlin
adb61e4d0d temp compilation fix for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 10:54:50 +00:00
Ryan Norton
174f2229cd Use proper wxURI unescape instead of old way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 10:00:05 +00:00
Ryan Norton
86470d432f final wxURI API changes. Changed Get to BuildURI to better reflect what its doing. Added wxURI::Unescape to unescape characters in a url or uri. Added wxURI::BuildUnescapedURI. Changed the wxURL convertXXXuri methods to use uri methods instead, and depreciated these methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 09:57:43 +00:00
Václav Slavík
cedea72ffa wxKeyEvent::m_uniChar must be copied by operator= too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 08:18:52 +00:00
Ryan Norton
b60b2ec8ac Inherit wxURL from wxURI, providing assignment, copy construction, comparison, and less duplication of code. Change wxURI a bit to meet some of Vadim's reccommendations - move accessors into header, and finish some of his other reccom. Change assignment to use const wxString& instead of const wxChar*. Change wxURI docs to reflect that it inherits from wxObject. Made preliminary docs for the wxURL transition. Add some unit tests for the transition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 06:49:46 +00:00
Ron Lee
68ca6f5252 Applied patch 1055774 from Paul Cornett for platforms
without a posix /bin/sh.  Among those reported as not yet
expired are Solaris 9, IRIX 6.5, and Tru64 5.1b.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 02:00:23 +00:00
Vadim Zeitlin
e6a156f9c8 use \true/\false and \arg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 01:05:20 +00:00
Vadim Zeitlin
8404931e0d minor cleanup: don't use bool parameters, don't typedef the enums, don't abuse references
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 01:03:38 +00:00
Robin Dunn
c7ea279bf6 just a little tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 00:43:09 +00:00
Robin Dunn
6be3fd57c6 Changed selectNewest to ensureMinimal. If the default version is >=
the minimum then use it, otherwise find an installed version that is
>= minimum, or will display a message and bail out.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 23:59:43 +00:00
Ryan Norton
153fe6e7dd final sweep over docs - replace & with \&
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 23:30:59 +00:00
Ryan Norton
0d8fc895d4 update docs, add to class list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 23:21:07 +00:00
Vadim Zeitlin
fd35980623 we don't have to call png_set_error_fn() any more after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 23:07:11 +00:00
Vadim Zeitlin
d10c19d6e0 use wx_png_error/warning when calling png_create_read/write_struct(), don't return from wx_png_error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 22:58:29 +00:00
Robert Roebling
01b5396fce Removed Pango homemade implementation and
reinstated old code that uses /Times and
    /Helv etc for printing PostScript.
  Various smaller fixes related to printing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 22:55:30 +00:00
Ryan Norton
dd65d8c830 wxURI. Move Convert/to/fromURI into uri.cpp so that it is compiled in base. Regenerate Bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 22:47:26 +00:00
Vadim Zeitlin
c0b0635cf6 removed src/gtk/eggtrayicon.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 20:35:27 +00:00
Włodzimierz Skiba
458d26a0cb Correct defaults for basic options (bug #1048680)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 19:27:14 +00:00
Vadim Zeitlin
b2d739ba55 don't preselect the first item if the array with the initial selections is empty in wxMultiChoiceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 19:23:59 +00:00
Julian Smart
34e0d9f874 Now possible to compile with wxURL disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 17:33:32 +00:00
Julian Smart
cf49c9551b GTK+1 doesn't have gtk_window_set_type_hint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 16:44:31 +00:00
Vadim Zeitlin
48a611cf00 don't abort if a shared library can't be loaded under OS X, just return an error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 13:53:37 +00:00
Stefan Csomor
0f4c414099 setting the invoking window added to two other wxMenuBar manipulating methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 12:59:19 +00:00
Włodzimierz Skiba
eb9f2b7086 Replace license.txt with licence.txt as it is really named.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 11:33:48 +00:00
Robert Roebling
ff910433fc Added initial support for GNOME printing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 11:19:30 +00:00
Robert Roebling
9f1316dc97 Moved "enablePrint" setting around.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 11:16:22 +00:00
Ryan Norton
c298ea48e4 Add preliminary wxStringBufferLength docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 08:18:36 +00:00
Ryan Norton
c81fc3344d Use wxStringBufferLength instead of wxXCharBuffer in constructors with conversion. Avoids both an allocation and a memory copy in normal (non-stl) wx mode with wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 07:48:28 +00:00
Stefan Csomor
a99915c224 fixes angle calculation (on mac ALWAYS clockwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 07:45:32 +00:00
Ron Lee
ffa0583fbf Update for rpath with uninstalled builds and utility search.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 06:25:12 +00:00
Robin Dunn
14b0f0d506 fixed copy/paste error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 01:15:34 +00:00
Robin Dunn
0dece789bc Version number bump
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 01:11:19 +00:00
Robin Dunn
3d78a53231 The old workaround for the 1-Jan-1970 bug still failed in some
timezones.  This new workaround seems to work better.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 01:06:45 +00:00
Robin Dunn
410bb8c16b Return from DoDrawSpline without doing anything (like segfaulting
<wink!>) if the list is empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 01:00:09 +00:00
Robin Dunn
1b10056f63 avoid crash if active_child_frame is not set yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 00:58:00 +00:00
Robin Dunn
1b135c93ed Ensire that m_value is updated when SetSelection is called
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 00:56:50 +00:00
Václav Slavík
37780c641b fixed wxFRAME_TOOL_WINDOW to use 'utility' type hint instead of not rendering any frame at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 22:45:32 +00:00
Robin Dunn
54c733833a * Added selectNewest(minVersion)
* Use the options in the sort ordering in addition to the version,
  this will put the gtk2 and unicode versions ahead of the others of
  the same version.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 21:55:25 +00:00
Robert Roebling
6038ec8eaf Next phase of Print Factory code.
Created a mini interface so that the generic
    wxPrintDialog can show a "printer" and a
    "status" line if the print factory wants
    this to be the case.
    Moved some code (print mode) back from the
    PostScript only print data to the general
    print data since it is sort of general.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 19:49:59 +00:00
Václav Slavík
63de666d9d at least partially implemented vswscanf() -- otherwise wx apps compiled against glibc 2.1 wouldn't run at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 17:42:39 +00:00
Włodzimierz Skiba
ae6c0ccf26 Avoid anchor for label which determined creation of the new file and is already included in filename.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 17:10:49 +00:00
Václav Slavík
6848729f2b prefix symbols with wx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-26 10:32:38 +00:00
Robin Dunn
0148e4348e Doc and comment updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-25 22:53:36 +00:00
David Elliott
3dd4386160 Convert back to UNIX line endings (again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-25 16:10:15 +00:00
Kevin Hock
19722331f8 MutexGui calls in WakeUpIdle are not needed under GTK2, fixing the long-standing "random" lockups experienced when using wxPostEvent from a thread. Collaboration with RR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-25 03:24:42 +00:00
Vadim Zeitlin
7de8eddef5 use GetBestSize() and not GetSize() for AsIs() size constraints -- this makes much more sense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 14:49:38 +00:00
Stefan Neis
a66dece0c5 Removed list of modeless windows (apparently no longer needed).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 13:46:06 +00:00
Stefan Csomor
fc58c6be4e corrected textbackground for theme text output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 12:48:00 +00:00
Stefan Neis
86dc230162 Fixed handling of modal dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 12:08:25 +00:00
Stefan Csomor
c871c71b9b adding Offset to wxRegion / carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 11:43:07 +00:00
David Elliott
f7ef06022c Fix wxExecute for ports other than wxMac and wxCocoa on Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 07:36:16 +00:00
Robin Dunn
db93f8f85b typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 01:04:11 +00:00
Robin Dunn
eed8659474 EP_ADD_OPTS defaults to true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 00:59:14 +00:00
Robin Dunn
5029118cb1 require --> select, added checkInstalled and getInstalled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 00:58:11 +00:00
Robin Dunn
79db03c99e Combine the common installer package into the main package
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 00:17:57 +00:00
Robin Dunn
45b323521b Don't uninstall common files if there is more than one wxPython installed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-24 00:17:12 +00:00
Vadim Zeitlin
f90387b4b4 don't give focus to the window if it ate the left mouse click
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 21:26:01 +00:00
Václav Slavík
260a67b7aa fixing sizing bug inside wxWizard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 16:10:26 +00:00
Václav Slavík
b0021947ef added InvalidateBestSize calls when combobox's content changes; DoGetBestSize now accounts for the width returned by GTK+ too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 16:06:11 +00:00
Vadim Zeitlin
377a8f52cf added MDI menu item translation, the menu was looking very wrong with only one item untranslated...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 15:24:23 +00:00
Vadim Zeitlin
78a9e10da1 updated version to 2.5.3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 14:56:35 +00:00
Vadim Zeitlin
37c2aa46d0 fixed VC++ size_t -> int conversion warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 13:55:20 +00:00
Vadim Zeitlin
6ce8c562b2 don't use _() as default parameter for wxPrintDialogBase title
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-23 13:10:00 +00:00
Robin Dunn
ec9b55ca46 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 20:36:32 +00:00
Robin Dunn
5df4dd4bc5 Keep a local copy of the daily builds too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 20:28:17 +00:00
Robin Dunn
a7bb0a9db6 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 20:27:22 +00:00
Kevin Hock
c6900c006b *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 20:16:43 +00:00
Kevin Hock
dbd94b7501 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 19:15:35 +00:00
Robin Dunn
119af81b23 Use a working dir for the uninstaller that does exist.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 19:12:04 +00:00
Kevin Hock
34621cc5d6 Documentation patch from Olly Betts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 19:11:07 +00:00
Kevin Hock
1399de550a Removed , from end of enumerated list wxPrintBin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 17:13:35 +00:00
Włodzimierz Skiba
b7edbfa019 Supress OW warning about empty *structor outside class definition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 17:10:34 +00:00
David Elliott
5dc471408f Cleaned up getRectsBeingDrawn:count: related code.
* Removed the exception handler; it's not needed anymore (thanks Ryan).
* Split the if statement and then case into two lines instead of one.
* Took some of the suggestions from the cocoa-dev mailing list:
- Changed code to use normal messaging syntax.
- Provided a category interface to silence the compiler warning on 10.2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 16:07:31 +00:00
David Elliott
9d1e4703d3 Forgot the appropriate return statement for the last patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 15:50:24 +00:00
David Elliott
4092a27504 Change friendship so that the base implementation class is the friend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 15:42:16 +00:00
Robin Dunn
02c3b4d92b A small fix for attachment popints and comments, from Pierre.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 15:24:55 +00:00
Robin Dunn
60b517c1f3 regenned the ReST docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 15:21:38 +00:00
Robin Dunn
851067d0f2 A unicode hack for the Rez/Derez hack
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 15:20:51 +00:00
Robin Dunn
4f60dce5d4 Remember the version selected and allow require to be called again as
long as a compatible version is requested.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 05:53:49 +00:00
Robin Dunn
f35732e954 build the unicode version too on Panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 03:07:31 +00:00
Robin Dunn
1e45356c50 renamed the output file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 03:06:34 +00:00
Robin Dunn
b908d8bf69 Rearrainged some bits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 03:05:08 +00:00
Robin Dunn
8ce7234a58 Some new icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 03:04:16 +00:00
Robin Dunn
4171e9dc20 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 02:51:10 +00:00
Robin Dunn
85245f48ad wxPython on OSX can now be built in Unicode mode, can support multiple
version installs, and comes with an uninstaller script.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 02:50:05 +00:00
Vadim Zeitlin
c39e759922 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 00:23:35 +00:00
Stefan Neis
21708c7331 Added stubs for OS/2 to new printing system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 21:32:57 +00:00
Václav Slavík
200ab0bff0 OS/2 needs wxUSE_OWNER_DRAWN, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 18:47:19 +00:00
David Webster
7804d121cb Get rid of the class naming conflict with the base header for Print and supress some warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 17:38:06 +00:00
David Webster
b5f10b014c Get rid of the class naming conflict with the base header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 17:36:01 +00:00
David Webster
b715de93a6 Removed temp OS/2 fix. Header now fixed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 13:58:08 +00:00
Vadim Zeitlin
ab13b95e5c compilation fix after last checkin (missing header)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-21 10:30:20 +00:00
Vadim Zeitlin
fdd99f154a added wxTextInputStream::operator>>(wchar_t) for compilers which support this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 22:50:03 +00:00
Vadim Zeitlin
e188df5dea decode URIs in wxFileDataObject::SetData(); fixes problem with filenames with spaces in their names (which were represented as )
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 22:14:55 +00:00
Vadim Zeitlin
4e689ecdb5 update g_isPainting in wxPaintEvent copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 22:10:35 +00:00
Vadim Zeitlin
ea180b184a added missing header (fixes compilation with WXWIN_COMPATIBILITY_2_4 == 0)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 22:03:54 +00:00
David Elliott
85c9f98b50 Rewrote wxSound:
* Get rid of #if wxUSE_SOUND from header.  wx/sound.h checks this already.
* Get rid of pragma interface/implementation. Apple GCC dislikes them anyway.
* Allow source file to use precompiled headers (wx/wxprec.h)
* Include only needed AppKit/Foundation headers, not AppKit/AppKit.h.
* Implement simple constructors inline in header.
* Get rid of m_sndname and m_waveLength instance variables.  They aren't used.
* Add copy constructor (why not).
* Move implementation of byte-array constructor into LoadWAV for consistency
  with UNIX wxSound.
* LoadWAV (what was in the constructor) now properly allocs, inits, and
  releases NSData.  The old code for this was not valid.
* Rename lastSound to s_currentSound.
* Rename isLastSoundLooping to s_loopCurrentSound.
* Ignore the sound:didFinishPlaying: delegate message if it is received
  for an NSSound other than s_currentSound.
* Create should not Stop the current sound.
* Don't use NSBundle to get a resource sound but use [NSSound soundNamed:]
  which will include system sounds.
* Playing a sound synchronously uses wxEventLoop::Dispatch which will
  really block (not spin the CPU like Yield).  The sound is considered
  finished playing when s_currentSound is set to something else.  In order
  to make sure we don't get stuck in this event loop the delegate
  calls wxApp::WakeUpIdle if it releases s_currentSound.
* Have IsPlaying() check to make sure s_currentSound is not nil since
  only messages returning another object or void are allowed to be
  sent to nil objects.

Changes involving retain/release
* Get rid of comment about tricky API, it's not.
* Get rid of isLastSoundInScope. Cocoa has proper reference counting.
* Add SetNSSound which, like the rest of wxCocoa, retains/releases
  appropriately, sets the delegate, and logs when WXTRACE=COCOA_RetainRelease.
* Destructor does SetNSSound(nil) which will always release the NSSound.
  Create and LoadWAV use SetNSSound method like the rest of wxCocoa.
* Make the delegate always release s_currentSound if not (or if done) looping.
  DoPlay sets s_currentSound to m_cocoaNSSound after retaining it so that
  the delegate can always safely release it.
* Stop, like everything else, does not need check of isLastSoundInScope


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 21:04:52 +00:00
David Webster
f6bc1c74e8 getservbyname under INNOTEK gcc needs a (char*), not (const char*) for the protocol argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 19:26:11 +00:00
David Elliott
b320510f98 Added some accelerators to the menu to help with stress testing wxSound:
Ctrl+O	Select WAV file
Ctrl+S	"Play sound synchronously"
Ctrl+A	"Play sound asynchronously"
Ctrl+T	"Play sound asynchronously (object on stack)" (T for temporary)
Ctrl+L	"Loop sound"


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 19:24:14 +00:00
David Elliott
1e85b547a5 Added CocoaSetKeyEquivalent() that sets the accelerators. Only implemented
for letters, numbers, and ascii control characters. TODO: up/down/etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 19:18:46 +00:00
Vadim Zeitlin
c87beb79f2 include colour.h (fixes wxX11 compilation under Unix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 17:29:21 +00:00
Vadim Zeitlin
8d8e24dfd7 removed duplicate #include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 17:21:37 +00:00
Julian Smart
ea2d542c01 Worked around font setting problem for GTK+1 on some
distributions. This is a workaround for wxGrid only.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 16:44:17 +00:00
Vadim Zeitlin
b67c2b8794 use slashes instead of backslashes and quotes instead of angle brackets in all #includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 15:14:46 +00:00
Vadim Zeitlin
18860312a4 fixed bug introduced by last commit: if we don't change the path because it is already correct, we should still change the name we use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 15:00:22 +00:00
Włodzimierz Skiba
a8d08dbd45 Minor manual fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 11:12:56 +00:00
Vadim Zeitlin
871cc651b7 only VC++ >= 7.0 has __COUNTER__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 10:47:28 +00:00
Włodzimierz Skiba
cd0c48001c DMC, OW and my copy of MinGW misses SH* values, Borland seems fine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 09:18:02 +00:00
Włodzimierz Skiba
86dd82baf9 Oups :-( incomplete previous undo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 01:25:38 +00:00
Włodzimierz Skiba
1c6f24145e Correct fix to the compile time assert under OW. Kudos to Vadim to the tip.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 01:20:58 +00:00
Vadim Zeitlin
8e5d510855 added stdpaths.* for MSW and Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:36:01 +00:00
Vadim Zeitlin
c320b3e32d initial Unix implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:35:26 +00:00
Vadim Zeitlin
edad629344 don't use wxCOMPILE_TIME_ASSERT2, wxCOMPILE_TIME_ASSERT works for VC++ too now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:34:40 +00:00
Vadim Zeitlin
ce336c6d76 moved AppendAppName() from MSW to common code; modified it to not double the trailing slash, if any
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:34:32 +00:00
Vadim Zeitlin
a39490aee6 removed special definition of wxCOMPILE_TIME_ASSERT2, keep it only for compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:33:31 +00:00
Vadim Zeitlin
c0fbf9294e define wxMAKE_UNIQUE_NAME so that it works even in VC++ with /ZI (edit and continue) option: use __COU*NTER__ instead of __LINE__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-20 00:31:58 +00:00
Vadim Zeitlin
90999185aa updated bulid notes to include cmd line building instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 23:51:04 +00:00
Vadim Zeitlin
9b5d7dfcaf removed unneeded junk copied from MSW port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 23:19:31 +00:00
Vadim Zeitlin
771be77f9a fixed status bar source file name; removed wxUSE_NATIVE_STATUS_BAR; removed generic status bar file from makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 23:17:30 +00:00
Vadim Zeitlin
3eb1416ab2 ignore build directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 23:12:12 +00:00
Robin Dunn
12f4eef30d reSWIGged for WebKitCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 22:05:47 +00:00
Robin Dunn
93ba536aa6 docstring typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:51:46 +00:00
Robin Dunn
e3461395ac reSWIGged for WebKitCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:50:40 +00:00
Robin Dunn
4d00d250f1 Give wxEVT_WEBKIT_STATE_CHANGED a dummy value too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:48:08 +00:00
Robin Dunn
b2033f1f37 reSWIGged for WebKitCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:41:29 +00:00
Robin Dunn
9d9cbcdd28 More WebKitCtrl tweaks, added wxWebKitStateChangedEvent and etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:40:31 +00:00
Włodzimierz Skiba
ceb3b0d8e2 Warning fix to avoid typecasting with OW elsewhere.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:10:42 +00:00
Robin Dunn
b870f2e67d a little cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:05:00 +00:00
Robin Dunn
c51dc21223 reSWIGged for WebKitCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:03:10 +00:00
Robin Dunn
f6f1e19f76 Some tweaks for WebKitCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:00:30 +00:00
Włodzimierz Skiba
7da60d7c18 OW warning fix. Our compile time asserts warns when used within function and dedicated #pragma seems not influence it so they are moved from functions into global space as near as possible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 21:00:17 +00:00
Václav Slavík
61b52e4667 added wxTB_HORZ_TEXT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:54:59 +00:00
Vadim Zeitlin
8a613d31a3 declaration (only, so far) for Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:51:17 +00:00
Vadim Zeitlin
af33b19957 wxStandardPaths test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:50:26 +00:00
Vadim Zeitlin
40e8ee374f initial implementation for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:50:06 +00:00
Vadim Zeitlin
6cb5e50b0d switched to using a real class instead of a namespace because of Mac base/GUI problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:49:02 +00:00
Vadim Zeitlin
b36d022a0d fixed GetConfigDir() description; added MT-safety note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:47:31 +00:00
Vadim Zeitlin
58dee21145 document that not skipping left click event results in focus not being given to the window under mouse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:11:21 +00:00
Vadim Zeitlin
9f01184787 don't set focus to the window when it is clicked if the event has been processed by the user code (this is consistent with how the standard controls already behave)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 18:09:13 +00:00
Vadim Zeitlin
6bb0970672 extracted LPITEMIDLIST wrappers in a separate header (also [will be] used by wxStdnardPaths)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 16:43:53 +00:00
Václav Slavík
ae688b6468 always use wxStaticCast in XRCCTRL (asserts in case of bad use in debug build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 15:13:11 +00:00
Julian Smart
b8387e0450 Cleaned up commented-out code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 13:45:01 +00:00
Julian Smart
e0f040b4bb Removed accidentally committed file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 13:42:38 +00:00
Julian Smart
ffecfa5aeb Committed William Osborne's wxPalmOS port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 13:40:30 +00:00
Vadim Zeitlin
698b34facd don't return wxLIST_HITTEST_ONITEMICON from HitTest() when the muse is clicked to the right of the icon label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 11:49:37 +00:00
Vadim Zeitlin
d80fc6df55 define __WXOSX__ for wxMac/Cocoa; document it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 09:02:10 +00:00
Vadim Zeitlin
036277a790 set mouse capture flag to false when releasing the mouse (bug 1049693)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 08:31:50 +00:00
Julian Smart
815cb839b5 SQLINTEGER not defined in iodbc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 08:18:40 +00:00
Stefan Csomor
33b35531ec eliminate double deletion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 07:06:06 +00:00
Stefan Csomor
e07a214281 leads to a double call of AddChild, if we don't see any problems, we'll remove it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 07:04:52 +00:00
Kevin Ollivier
7875e5ff98 Additions for webkit wrapper support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 06:07:13 +00:00
Kevin Ollivier
5ed68428a8 Adding wxWebKitCtrl wrappers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 06:04:26 +00:00
Ryan Norton
f6d0a117f2 Rework comment a bit to accurately reflect situation on 10.2 - it doesn't crash, rather it stalls :).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 05:18:02 +00:00
David Elliott
eba2de69cc Fixed incorrect comment about [NSDate distantPast]. We aren't seeking to
block for an infinite amount of time but rather to not block at all.
Also added a bit of an overview since apparently the purpose of this code
was not readily apparent even with the existing comments.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 04:43:03 +00:00
Robin Dunn
17f3e5304f Remove pre-existing wx dirs from sys.path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 04:04:27 +00:00
Robin Dunn
b31cbeb974 More PyPlot updates from Gordon Williams:
- Imported modules given leading underscore to name.
   - Added Cursor Line Tracking and User Point Labels.
   - Demo for Cursor Line Tracking and Point Labels.
   - Size of plot preview frame adjusted to show page better.
   - Added helper functions PositionUserToScreen and
     PositionScreenToUser in PlotCanvas.
   - Added functions GetClosestPoints (all curves) and GetClosestPoint
     (only closest curve) can be in either user coords or screen
     coords.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 03:58:40 +00:00
Robin Dunn
dfc57effd1 Remove comment too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 03:51:35 +00:00
Robin Dunn
8596dc0b9b use multiple images for changing the taskbar icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 03:50:09 +00:00
Robin Dunn
5894743813 fix image range
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 03:49:19 +00:00
Vadim Zeitlin
0b75a1e039 fixed include guard after renaming the file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 23:28:41 +00:00
Vadim Zeitlin
48713afd53 - added and documented Get/SetInstallPath() under Unix
- corrected returns values of several functions for Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 23:27:37 +00:00
Vadim Zeitlin
96e2aec50a renamed wxFileLocator to wxStandardPaths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:35:51 +00:00
Vadim Zeitlin
3640d0da6b fix Mac/Unicode build after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:26:24 +00:00
David Elliott
2b27a03922 Due to the last change the delegate should not release itself.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:23:51 +00:00
Vadim Zeitlin
94009d33c1 unsigned off_t doesn't exist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:17:07 +00:00
David Elliott
a2c1097b8a Renamed m_hSnd to m_cocoaNSSound (match rest of wxCocoa).
Create delegate as a static member shared by all instances.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:12:57 +00:00
Julian Smart
2841cdd89b Don't remove generic status bar from parent, since it can be used on
arbitrary windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:07:47 +00:00
David Elliott
4fca6ee1a6 Removed some extraneous whitespace.
Changed YES/NO to true/false; do not confuse BOOL (Objective-C) with bool (C++).
Changed some of the indentation to match that the rest of wxCocoa.

There was an if (isLastSoundInScope = NO) which I think was wrong not only
because it used NO rather than false but also because it's an assignment
rather than a test.  Changed it to if (!isLastSoundInScope).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 21:41:34 +00:00
Julian Smart
c5b3143a47 wxRadioButtons in the same group no longer have to be consecutive
(there may be intervening controls). Without this fix, an out-of-sync
assert is generated when clicking on a radio button and then calling
GetValue().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 20:20:47 +00:00
David Elliott
f31424dbe9 wxCocoa: Add native file dialog from Ryan Norton. Modified patch #1039368
https://sourceforge.net/tracker/?func=detail&atid=309863&aid=1039368&group_id=9863


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 19:15:42 +00:00
David Elliott
0e3165d725 Rebaked (build/bakefiles/common.bkl 1.95->1.96 change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 17:02:37 +00:00
Václav Slavík
e0aeebed0a fixed previous revision: call wxControl's, not wxButton's DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 13:13:39 +00:00
Włodzimierz Skiba
c6fbe2f0c8 Unnecessary const_ prefix removed (blindly).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 13:00:11 +00:00
Václav Slavík
09a65e631a be user friendly on Unix and expand the / node automatically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 12:50:10 +00:00
Václav Slavík
b2b4469be1 wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing bug)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 12:38:21 +00:00
Václav Slavík
b1ad1424b9 support alpha channel in menu items bitmaps, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 09:43:37 +00:00
Václav Slavík
3141599efa XRC ignored menu bitmap on non-MSW platforms, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 09:30:32 +00:00
Václav Slavík
eb5fa34b65 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 09:05:49 +00:00
Włodzimierz Skiba
1b941f2d31 Warning fixes for OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 05:56:07 +00:00
Vadim Zeitlin
6c6ea7bed1 remove the selection when SetSelection(-1) is called instead of asserting (as documented)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 01:03:02 +00:00
Vadim Zeitlin
c4e05385a2 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 00:23:56 +00:00
Vadim Zeitlin
26f2b058cf documented that SetSelection(-1) removes the selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 00:18:43 +00:00
Vadim Zeitlin
a018a119bd added wxDynamicLibrary::HasSymbol()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 23:20:51 +00:00
Robert Roebling
fd64de596c Renamed wxPrintNativeData methods to better match
those of the preexisting wxMac class. This should
    make transition of the wxMac classes to the new
    wxPrintNativeData classes easier.
  Renamed wxWindowsPrintNativeData to a proper name
    that is less confusing (GetNativeData -> GetDevMode).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 23:00:41 +00:00
Vadim Zeitlin
3692b33c7f added \newsince command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 22:30:01 +00:00
Vadim Zeitlin
1ee445c75b added interface for wxFileLocator class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 21:43:08 +00:00
Włodzimierz Skiba
7ac31c429f Warning fixes related to various cases of typecasting.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 21:39:05 +00:00
Vadim Zeitlin
804cd2075d mention enhanced metafiles bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 21:28:18 +00:00
Vadim Zeitlin
15e2adbd3b compilation fix for Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 20:17:00 +00:00
Włodzimierz Skiba
65aeb57135 wxHashMap compatible typecasting.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 19:45:42 +00:00
Vadim Zeitlin
42a2452301 - wxDynamicLibrary::GetDllExt() now returns ".bundle", not ".dylib"
- wxDynamicLibrary::GetSymbol() now prepends underscore to the symbol name


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 19:45:20 +00:00
Robert Roebling
bf9848e73d Took one part of the patch back again...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 19:32:48 +00:00
Robert Roebling
8850cbd3c3 First step at moving the print (dialog) native
data into native dirs and cleaning up the code.
   The native part of wxPrintData is now created
   via the wxPrintFactory. I moved the code for
   PostScript to /src/generic/prntdlgg. and for
   MSW to its the respective dir. I only made
   wxMac compile, but it already has a native
   print data class, which should be easy to
   merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 17:25:40 +00:00
Włodzimierz Skiba
4200d1f416 __WXDEBUG__ is defined/undefined, not 0/1!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 16:28:20 +00:00
Włodzimierz Skiba
7dca9b44f5 _() needs intl.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 16:21:32 +00:00
Vadim Zeitlin
7406cb31ed removed obsolete and unused code for USE_BITMAP_MASKS == 0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 14:54:17 +00:00
Robert Roebling
12ff822199 Forgot to commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 14:47:27 +00:00
Robert Roebling
f53df133a6 Applied (part of) small patch from Chris Bogolte which
corrects a test in the Blit code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 14:32:42 +00:00
Vadim Zeitlin
e9a05074a9 compilation fix for !USE_PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 14:28:26 +00:00
Stefan Csomor
73e54eb489 added mac constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 13:11:05 +00:00
Stefan Csomor
2c899c2010 guard against m_peer = NULL in Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 11:51:43 +00:00
Stefan Csomor
18a82b9cd3 don't restrict to OS9 API for Mac-Builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 10:52:37 +00:00
Stefan Csomor
684e0b31ef __WXMAC_OSBUILDTYPE__ selections are now only defined if they are TRUE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 10:45:21 +00:00
Stefan Csomor
ca80fdee5e __WXMAC_OSBUILDTYPE__ selections are now only defined if they are TRUE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 10:36:33 +00:00
Robert Roebling
c9433ea976 Fixed lost focus events in wxListBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 09:58:46 +00:00
Robert Roebling
523fd2211f Link problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 09:57:22 +00:00
Robin Dunn
498fbcb4f5 Test GetTextRange on some unicode text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 02:29:51 +00:00
Robin Dunn
6636ac1ea9 Use Scintilla's functions for Unicode/UTF8 conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 02:27:22 +00:00
Vadim Zeitlin
bd2fe27eed added test for the (just fixed) bug with adding the first entry to the root group
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 01:13:54 +00:00
Vadim Zeitlin
d4cace1ccd use common code to determine best notebook size instaed of Mac-specific which mistakenly used current pages sizes and not the best ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 01:00:31 +00:00
Vadim Zeitlin
fc2739d5f0 added --linkdeps switch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 00:38:31 +00:00
Vadim Zeitlin
0da888ae90 fixed bug with adding new entries to a root group with subgroups but without any existing entries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 00:05:21 +00:00
Robert Roebling
c061373dc5 Began work on print dialogs. Now wxPrintDialog
is a pimpl implementation of the native
    dialog classes, which are created in wxPrintFactory.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 22:11:48 +00:00
Václav Slavík
9a8d8c5a51 don't use m_instanceAsWindow to convert dialog units, it's not fully constructed yet and can't provide the information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 21:52:54 +00:00
Vadim Zeitlin
fa4a69423d don't leave two conscutive separators after "moving" a standard menu item to the application menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 20:54:46 +00:00
Vadim Zeitlin
ea3cdc4f89 don't reset tool/status bar pointers manually, it is now done automatically by the dtors of the bars themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 20:28:36 +00:00
Vadim Zeitlin
2ab822146c reset parent frame tool/status bar pointer automatically when the bar is destroyed; this ensures that we're never left with dangling pointers and fixes a crash under Mac when MDI child frame with a toolbar is closed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 20:25:39 +00:00
Vadim Zeitlin
15b0d04889 added wxSetCursorEvent documentation (patch 1048181)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 19:59:04 +00:00
Václav Slavík
6d98ee990e wxProcess::OnTerminate is not const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 19:43:52 +00:00
Vadim Zeitlin
3db7220e05 unused params warnings (patch 1048431)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 19:41:18 +00:00
Robin Dunn
0bee2fce88 Fix to use old AutoWidthMixin API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 17:46:29 +00:00
Vadim Zeitlin
488abb222a call AddChild() when the control is already reallly created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 15:00:40 +00:00
Vadim Zeitlin
7561181f03 suppress VC++ warning about long -> void * conversion too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 13:39:45 +00:00
Vadim Zeitlin
7a295dfa5c fixed enhanced metafiles loading from files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 13:31:27 +00:00
Vadim Zeitlin
68e24a7b28 replace post-linking commands with true, not #, for the platforms for which they don't make sense: this allows to use things like wx-config --rezflags directly in makefiles and not only with autoconf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 11:45:06 +00:00
Vadim Zeitlin
170b04bae6 use size_t for the total size of data instead of wxFileSize_t (msg catalogs can't be that big...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 11:31:27 +00:00
David Elliott
a5593369fc Add a second wxTaskBarIcon that uses the Dock (wxCocoa only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 02:15:48 +00:00
Dimitri Schoolwerth
b9242cc700 fixed CFM build linking error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 01:49:28 +00:00
Vadim Zeitlin
ef6816ef25 fixed fatal bug when moving the control after itself in tab order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 01:47:22 +00:00
David Elliott
a45cd23349 Whoops, forgot to commit this.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 01:30:39 +00:00
Vadim Zeitlin
8fc2f387cd added missing WXDLLEXPORT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 00:45:07 +00:00
Vadim Zeitlin
5f315f781a fixed inconsistent dllspec warning in DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 00:38:10 +00:00
Vadim Zeitlin
5b952139e8 fixed the just added wxStringTokenizer::GetPosition() test overwritten by the previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 00:27:02 +00:00
Vadim Zeitlin
296d315635 use unsigned chars for UTF8 data (avoids warnings)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 00:16:27 +00:00
Vadim Zeitlin
76c6fcbc31 added wxStringTokenizer::GetPosition() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-16 00:14:07 +00:00
David Elliott
a49baeab5a Rebaked/autoconfiscated for wxCocoa wxTaskBarIcon addition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 23:03:39 +00:00
Vadim Zeitlin
b4cfe261db implemented SetWildcard()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 22:55:13 +00:00
David Elliott
f1d9e1ec6b wxCocoa: Added wxTaskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 22:52:28 +00:00
David Elliott
c9f52ac517 Yes Ryan, I really did mean to remove these files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 22:44:06 +00:00
Robin Dunn
1683c95020 DocsDemo --> docs-demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 21:14:43 +00:00
Vadim Zeitlin
2782282522 use wxPtrToUInt/UIntToPtr instead of (removed) ULong versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 21:10:45 +00:00
Václav Slavík
2cc7562846 linkage fixes for monolithic static build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 21:05:02 +00:00
Robin Dunn
05e443d7ca Give the win32 runtime installer its own readme.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:58:26 +00:00
Vadim Zeitlin
dffd27ec31 removed pragma interface which resulted in link errors when inline functions from this file were used; remove wxULongToPtr/wxPtrToULong which could truncate the pointer; added wxUIntToPtr in addition to existing wxPtrToUInt (which now takes const pointer) to replace them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:58:23 +00:00
Vadim Zeitlin
f12885449a use wxPtrToUInt instead of (lossy) wxPtrToULong
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:35:39 +00:00
Robin Dunn
f2f8a5fce8 Show PlatformInfo in the About box too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:31:23 +00:00
Robin Dunn
af9dbe709d Show PlatformInfo in the About box too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:21:37 +00:00
Robin Dunn
07aff078f8 just a whitespace change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:07:51 +00:00
Robin Dunn
bceb17b2e0 more consistent naming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 20:05:01 +00:00
Włodzimierz Skiba
409ded0fc5 Unnecessary wxString(wxString).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:50:37 +00:00
Robin Dunn
7869b836de Corrected some comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:35:03 +00:00
Robin Dunn
4efdef2c87 Docs updates for 2.5.3.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:30:24 +00:00
Robin Dunn
db301e681f Tweak unicode --> string conversion helper so UnicodeDecodeError is
raised when appropriate instead ofg just catching everything and
raising TypeError


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:28:34 +00:00
Włodzimierz Skiba
7747ff60b8 GUI is not All at all ;)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:03:34 +00:00
Włodzimierz Skiba
9f13661f8b Parts of wxSizer::Show() extracted into wxSizer::GetItem() (together with documentation).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 18:58:52 +00:00
Robin Dunn
15513a8066 Applied patch from Pim Van Heuven that modifies 4 files:
- wxPython/demo/ListCtrl_edit.py (new demo)
    - wxPython/demo/Main.py (include new demo in demo app)
    - wxPython/wx/lib/mixins/listctrl.py (several improvements to
      TextEditMixin)
    - wxPython/wx/lib/wxpTag.py (some small fixes)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 18:45:21 +00:00
Václav Slavík
6537ccf8cd don't create makefiles for nonexistent utils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 16:27:15 +00:00
Włodzimierz Skiba
564c92d95b Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 16:12:58 +00:00
Włodzimierz Skiba
8253f2e063 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 16:00:06 +00:00
Vadim Zeitlin
a22d4c5cbe added Norvegian translation (Hans F. Nordhaug)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 15:44:21 +00:00
Vadim Zeitlin
39a2048975 ReadChar() is called GetChar() in fact
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 15:41:18 +00:00
Włodzimierz Skiba
b8ee9a863c Quiet cooperation between MSW and wxGL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 15:29:31 +00:00
Włodzimierz Skiba
414dfb5804 DMC fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 15:05:52 +00:00
Václav Slavík
bc3435bba1 quick fix for misgenerated console samples' Makefile.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 14:35:53 +00:00
Václav Slavík
c55504f7f7 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 14:10:55 +00:00
Vadim Zeitlin
1a14587d59 VC++ warning fixes for /Wp64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 13:09:00 +00:00
Włodzimierz Skiba
b9daf00aac Fix for platforms where 64-bit value support is not implemented in switch/case statements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 08:13:09 +00:00
Ron Lee
10f206ad20 For autoconf/unix builds update the hardcoded afm dir too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 07:50:21 +00:00
Ron Lee
b1433926f2 Bump copyright date and indicate debug builds too in 'easter egg' dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 07:25:40 +00:00
Jouk Jansen
6dfd822aca Committing in .
Added some type casts to silence the compiler on OpenVMS

 Modified Files:
 	wxWidgets/src/common/db.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 06:45:11 +00:00
Stefan Csomor
1dd82eff99 removed IsShown guards, allowing now for manipulation of hidden toolbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 06:12:27 +00:00
David Elliott
950432e407 Allow the wxMenu to be owned by the NSMenu so that it can be returned
from methods which Cocoa calls when a menu is to be popped up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 03:06:50 +00:00
David Elliott
3312496dcc Allow the dealloc message to be caught
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 02:55:15 +00:00
David Elliott
d04995b3a6 Use wxObjcAutoRefFromAlloc for sm_cocoaTarget.
Move some processing code from wxMenuItemAction to CocoaItemSelected.
Add Cocoa_validateMenuItem and use it instead of calling IsEnabled directly.
Do not set the target or action for wxMenuItem that open submenus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 01:39:35 +00:00
Robin Dunn
28d1454aff Adapt to new file naming scheme, new Installer structures, and other
build tweaks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 01:13:02 +00:00
Robin Dunn
7093495299 Restructured for new style RPMs, etc. Can build all the RPMs from a
single .spec file, by using --define parameters.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 01:02:22 +00:00
Robin Dunn
6736ec0807 be cmd.exe compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:56:22 +00:00
Robin Dunn
502827c88f Don't make the metadata xml file anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:55:39 +00:00
Robin Dunn
ae13f29275 * Don't reset LC_NUMERIC if on Python 2.4
* Always save the tstate


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:54:53 +00:00
Robin Dunn
a38c690323 wxRect --> wx.Rect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:51:57 +00:00
Robin Dunn
41e8a69cdb workarounds for old versions of distutils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:47:56 +00:00
Robin Dunn
f189a52be4 put back the code to add the 3rd digit in the extraPath
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:46:11 +00:00
Vadim Zeitlin
67c20e133e use wxFileSize_t instead of wxFileOffset or off_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:34:21 +00:00
Vadim Zeitlin
bd3cea7d2c fixed wxFileSize_t definition under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:23:32 +00:00
Vadim Zeitlin
02aef13c07 made Tell/Seek/Length() return wxFileSize_t as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:22:27 +00:00
Vadim Zeitlin
93e0db9a80 added wxFileSize_t, changed types of wxFile methods/parameters once again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 00:01:00 +00:00
Vadim Zeitlin
a752b8c4e0 always let GTK process focus_out events itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 23:46:08 +00:00
Vadim Zeitlin
f5c74fddf0 call Skip() under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 22:31:52 +00:00
Vadim Zeitlin
a13438c535 replaced deprecated GetNoHistoryFiles() function with GetCount()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 22:27:57 +00:00
Włodzimierz Skiba
0a8c46e1bd Do not waste time for USE_ODBC=0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 19:15:38 +00:00
Włodzimierz Skiba
6002d043b5 Bug #1001474. Text!=Password.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 18:09:33 +00:00
Włodzimierz Skiba
ad81647631 Warning fix for wxDateTime_t <-> MSW data exchange.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:42:33 +00:00
Włodzimierz Skiba
7663d0d4bf Fix to wrong order of parameters. Used wxStringBase constructor has parameters in reversed order in comparison to wxString (iirc due to stl::string compatibility).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:36:04 +00:00
Włodzimierz Skiba
326a37f148 Fix to the crash in all MSW/OpenWatcom apps using toolbars. wxString() in A?B:C is not a good idea.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:27:33 +00:00
Włodzimierz Skiba
e7274ba212 Fix to bug #1046289. dtor of wxMetaTagParser must be executed earlier than dtor of 'charset'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:19:04 +00:00
Włodzimierz Skiba
54e3a7c110 Do not waste time with OpenGL turned off.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:09:43 +00:00
Włodzimierz Skiba
f46a065c3b Free DMC does not distribute OpenGL support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 17:05:29 +00:00
Ryan Norton
ee2af3c885 readd files to restore cocoa compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 14:34:31 +00:00
Ryan Norton
af17760d08 Reverted and fixed really broken overcommit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 14:07:27 +00:00
Václav Slavík
a30f955ffd fixes to building wxBase on Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 12:49:42 +00:00
Julian Smart
d8c91d699f Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 10:32:33 +00:00
Julian Smart
027aa6fa77 Doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 10:29:58 +00:00
Julian Smart
608754c4a3 Added SetScrollLinesX, SetScrollLinesY so apps can work around scrollbar
appearance problems by setting the scroll increment to e.g. 1
(Scrollbar problems caused by rounding errors - see comments in grid.cpp).
Also removed obsolete functions from reference, rearranged alphabetically


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 10:28:20 +00:00
Julian Smart
387d96cc8f Commented out SetFont(wxNullFont) which causes an assertion on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 10:16:24 +00:00
Václav Slavík
b29c9f3b07 added wxTB_HORZ_LAYOUT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 09:29:02 +00:00
David Elliott
ccdc365485 Removed empty wxCocoa wxFileDialog implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 03:39:47 +00:00
David Elliott
5de1602ce1 Reverted broken test to determine wxHAS_TASK_BAR_ICON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 03:05:41 +00:00
David Elliott
ec7c50a5ed Removed empty wxCocoa taskbar files and broken files.bkl commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 03:01:44 +00:00
Vadim Zeitlin
806e2f154a give an #error if wxUSE_GLCANVAS == 0 instead of building empty samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 21:19:38 +00:00
Julian Smart
cc0c05cd9f gtk_frame_focus_out_callback can be called with g_activeFrame
null; so test for it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 20:47:12 +00:00
Ryan Norton
7c57ddc300 fix syntax errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 17:24:35 +00:00
Ryan Norton
0ea62c2105 fix syntax error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 17:22:40 +00:00
Ryan Norton
cabf7af237 small doc cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 17:10:51 +00:00
Robin Dunn
58c132bbfc line segment fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 15:14:59 +00:00
Robin Dunn
303aff5ed8 dc.DrawLines fixed [1046055]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 15:14:10 +00:00
Włodzimierz Skiba
d9e9fb523f Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 14:11:35 +00:00
Włodzimierz Skiba
5e233068dc Darwin fixes (OW,BCC,MinGW,DMC tested).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 14:09:48 +00:00
Włodzimierz Skiba
6fb99eb3b7 Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 14:04:19 +00:00
Włodzimierz Skiba
383f6abdbf Fix to reflect wxUNIVERSAL conditions from header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 09:24:09 +00:00
Ryan Norton
49dcf8bfb8 crush compiler warnings and handle out of memory errors slightly better
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 02:54:32 +00:00
Vadim Zeitlin
42f25dcfc7 check that item pointer is non-NULL in WM_DRAW/MEASUREITEM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 21:08:54 +00:00
Robert Roebling
e81e3883b9 Added new wxPrintFactory code and made wxPrinter
and wxPrintPreview make use of it. BIG CHANGE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 21:07:42 +00:00
Włodzimierz Skiba
e4a4a50b90 Reverted due to Darwin and other conflicts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 20:48:22 +00:00
Włodzimierz Skiba
2c53a80a09 Reverted due to Darwin conflict.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 20:47:04 +00:00
Włodzimierz Skiba
05689a13cc Reverted conflict with Darwin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 20:14:23 +00:00
Włodzimierz Skiba
ecd9653bf3 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 19:29:12 +00:00
Ron Lee
8e32e729a5 Update config.{guess,sub}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 19:05:46 +00:00
Ron Lee
21eadc1af1 Regenerate .po files from 2.5.3 source.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 18:59:54 +00:00
Václav Slavík
088dedd32d updated after moving xrc to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 18:28:43 +00:00
Julian Smart
0c8a698b30 Restored the default wizard height to match 2.4 (and bitmap size)
settings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 18:15:59 +00:00
Julian Smart
866918a854 Corrected swapped args
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 18:02:10 +00:00
Włodzimierz Skiba
0c92403494 Whitespaces, tabs and fix to the lack of empty line at end.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 17:12:26 +00:00
Włodzimierz Skiba
3690202915 Remove old pragmas for avoiding warnings with Open Watcom. They are not working with new build system and have to be passed to compiler through options.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 16:58:44 +00:00
Włodzimierz Skiba
84f7327f47 Undo last change due to STL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 15:30:08 +00:00
Ryan Norton
4413571533 annoying oversight - someday compilers will point this out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 15:22:47 +00:00
Ryan Norton
421f1954f9 slight correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 15:03:37 +00:00
Ryan Norton
eaceebf6ce get rid of global vars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 15:01:47 +00:00
Ryan Norton
01040ff02d I can't beleive I forgot this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 14:55:04 +00:00
Václav Slavík
2c12c792f3 added wxNB_TOP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 14:43:04 +00:00
Ryan Norton
645a8fabef patch from list to fix warning and get rid of unneccessary call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 14:10:06 +00:00
Ryan Norton
926f877be5 compilo fix (blind)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 14:02:57 +00:00
Ron Lee
3f45f8bf3d Eliminate the redundant no_wx var and the extra test to set it.
Don't perform unrelated tests inside a single CHECK/RESULT block.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 13:23:09 +00:00
Ron Lee
8dabd665bd Don't leak intermediate results of tests for wx2.4 if it is not installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 13:16:03 +00:00
Václav Slavík
984c33c9c7 added \ escaping in XRC (patch 1042675)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 10:23:16 +00:00
Julian Smart
0f0e71f433 Also distribute src/gtk/*.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 07:52:04 +00:00
Vadim Zeitlin
19b65a3033 wxPuts() should output a trailing newline even in Unix/Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 23:49:15 +00:00
Vadim Zeitlin
8d6f95db28 mention that this file can be used under wx licence too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:58:17 +00:00
Vadim Zeitlin
bddb82b3c2 added ADVANCED_GTK_HDR section for src/gtk/eggtrayicon.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:57:14 +00:00
Robin Dunn
d1f46a1c4d Use a better fixed size for the spin button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:16:06 +00:00
Robin Dunn
f81ef370c4 Doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:15:15 +00:00
Robin Dunn
15dd11365e Clean up comments a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:14:31 +00:00
Robin Dunn
f54a36bba8 MaskedEdit updates from Will Sadkin:
- Added '*' mask char that means "all ansii chars" (ords 32-255)
    - Added proper unicode support to masked controls and wx.tools.dbg
    - Fixed two reported missing import bugs introduced by package
      creation
    - Converted masked package doc strings to reST format for better
      epydoc support
    - lots of doc string improvements and function hiding to better
      reflect package's public contents.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 22:13:18 +00:00
Robin Dunn
84f85550e5 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 18:44:09 +00:00
Robin Dunn
047b2059cf forward declare wxPyTaskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 17:12:43 +00:00
Włodzimierz Skiba
42841dfcad Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 16:30:43 +00:00
Ryan Norton
e40bae72d4 temp. solution to get unicode to work on 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 15:38:05 +00:00
Włodzimierz Skiba
e0ad14ca47 Missed wxList::Erase description.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 12:15:22 +00:00
Ryan Norton
f7e98dee7e cocoa doesn't need system framework - string conversion for cocoa - focus for cocoa - a bit of change for string unit tests for new functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 02:02:30 +00:00
Roman Rolinsky
80389ff709 Applied changes by Bartlomiej Gorny for recent files and style panel fix.
cellpos & cellspan parameters are changed to type ParamPosSize.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 00:00:31 +00:00
Roman Rolinsky
3b35f6d8b3 fixed spacer image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 23:55:29 +00:00
Roman Rolinsky
714457aeda Fixed spacer image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 23:48:27 +00:00
Stefan Neis
9e7050926b Move children if parent gets resized.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 23:16:54 +00:00
Julian Smart
af2ae80795 Script tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 22:43:06 +00:00
Julian Smart
501591aad2 Make dist correction for Motif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 22:38:43 +00:00
Julian Smart
09e7b3a0f5 Script updates, FAQ updates from web site
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 22:33:43 +00:00
Julian Smart
659ade8c5b Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 15:42:55 +00:00
Ryan Norton
215f9d70dd correct assignment in constructors, a little optimization, and some rare (impossible?) case sanity checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 13:30:55 +00:00
Julian Smart
7bb7fa834b Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 11:44:00 +00:00
Julian Smart
c135b1e269 Added PNG bitmaps for easier editing (forgot to commit previously)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 11:31:28 +00:00
Julian Smart
0451a04544 Script tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 10:27:31 +00:00
Julian Smart
2978723799 Removed types that don't exist in iodbc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 10:10:27 +00:00
Julian Smart
58e0338a8c Fixed the change that broke eVC++ compile (please don't blind-fix this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 09:30:02 +00:00
Robin Dunn
e44b5196a6 Don't bind the ACTIVATE events until the log window is created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 00:57:35 +00:00
Robin Dunn
5810801554 Removed tool batch files, they can just be generated as part of the install.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 00:51:22 +00:00
Robin Dunn
cb56afc421 * build and distrib tweaks.
* restructuring of installer packages
* MSW build can use either MONOLITHIC or multi-lib wx build


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-10 00:48:34 +00:00
Vadim Zeitlin
f07962f933 the #ifdef around BROWSEINFO.lpszTitle assignment is bogus; should be c_str() everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 21:48:14 +00:00
Vadim Zeitlin
8813578906 use wxStrdupA() instead of #ifdef's around strdup()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 21:45:23 +00:00
Julian Smart
02538f2d7a Fix for Standard WinCE SDK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 20:34:56 +00:00
Julian Smart
e761df38aa Use _strdup under WinCE/eVC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 19:56:46 +00:00
Julian Smart
7c9b17c1d1 SetSizeHints -> DoSetSizeHints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 19:19:00 +00:00
Ron Lee
41d8b0c9ca gtk2 is the default now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 17:52:09 +00:00
Ron Lee
46ec284e56 Add man page link for pywxrc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 17:37:12 +00:00
Julian Smart
59ba321bca Workaround for incorrect header in some versions of Mingw32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 13:39:57 +00:00
Václav Slavík
f9e1c3c501 fixed wxrc installation and cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 12:53:00 +00:00
Ron Lee
63f018eb41 Add basic --utility option for finding build dependent utils.
More strictly define the exit codes -- 0 for success, 1 for failure,
2 for options that are not supported -- so as to enable feature testing.
Quote the mac rezflags hack.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 12:08:05 +00:00
Julian Smart
154e1ca181 Resolved ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 10:52:01 +00:00
Julian Smart
f16e8dc98d Tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 10:51:07 +00:00
Julian Smart
46b5ed4d7d Removed over-specific references to wxDDE..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 10:30:32 +00:00
Ryan Norton
082642722c correct white values in extra stock cursors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 03:07:24 +00:00
Robin Dunn
9fd1fa4b1a check for wxHAS_HUGE_FILES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 01:26:43 +00:00
Robin Dunn
e2837d11f3 Fix docstring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 01:26:15 +00:00
Robin Dunn
f5bd42d10b Change macro used for OnGetItemImage so it ignores the base class
version


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 01:25:33 +00:00
Ryan Norton
19db911ad2 fix description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 23:33:11 +00:00
Ryan Norton
063864481a final null-char wxString stuff, a couple of bugfixes and lots of code cleanups - fixups to changes.txt as per someone's suggestions - support for a lot more stock cursors on wxCocoa using the cursors from the carbon port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 23:19:39 +00:00
Václav Slavík
992b2ec476 propagate invalidated best size upstream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 21:52:52 +00:00
Kevin Hock
395698b2f3 Added Quicktime framework from System folder, updated project for hid.cpp, statbar.cpp and gdiobj.cpp and taskbar.cpp which seemed to be incompletely added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 20:05:34 +00:00
Włodzimierz Skiba
a6ebd5596e Fix for building with limited ports/platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 19:51:30 +00:00
Włodzimierz Skiba
0148745bb7 Better markup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 19:41:14 +00:00
Włodzimierz Skiba
5c519b6cf7 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 18:49:13 +00:00
Robin Dunn
3e98bb2a88 Make NOP versions of Mac[GS]etMetalAppearance for the other platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 17:37:08 +00:00
Václav Slavík
92a50a3990 fixed AFM metrics installation so that PostScript printing works again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 16:26:51 +00:00
Robin Dunn
611a725ecd Check for an image list before complaining in OnGetItemImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 16:14:41 +00:00
Julian Smart
d66699e2d9 Added comment about setting AFM path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 14:54:11 +00:00
Julian Smart
9c2d002b3e Regenerated makefiles for 3rd-party lib change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 11:20:24 +00:00
Julian Smart
53ec4e9771 Added script to bake everthing (OK, so it's trivial...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 10:53:19 +00:00
Julian Smart
29607f23ae Regenerated from bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 08:43:28 +00:00
Ryan Norton
30261041bc final compilo fixups for 10.2 unicode - c/c++ fixes for regex - fixup regex unit tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 05:00:28 +00:00
Ryan Norton
1e15159472 various cleanups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 01:26:43 +00:00
Ryan Norton
0c0be4a318 wxSound for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 00:47:47 +00:00
Ryan Norton
51259762d5 wxDisplay for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 00:40:19 +00:00
Vadim Zeitlin
eb84314b79 (blind) fix for Metrowerks/Win32 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 00:26:20 +00:00
Vadim Zeitlin
4ae9be50fd renamed __HUGEFILES_SUPPORTED to wxHAS_HUGE_FILES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 00:20:07 +00:00
Ryan Norton
51678b5b76 wxCocoa link fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 00:08:33 +00:00
Ryan Norton
8a9c20b016 fix darwin defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 23:32:04 +00:00
Ryan Norton
b956262276 a bit of cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 23:21:23 +00:00
Robin Dunn
c846884b38 Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 22:58:09 +00:00
Ryan Norton
ab921f5f80 bakefile time!! (Mainly stuff for wxCocoa)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 22:35:53 +00:00
Ryan Norton
265d5cce05 1.10.2 and less mbtowc and wctomb HAVE THE COOTIEScd .. (they are just stubs and return 0 - we need our own, even in ANSIcd ..!)\n2.Finalize the null character changes in wxString - change mb_str and wc_str to not stop at null characters\n3.Add unit tests for the above
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 22:28:57 +00:00
Kevin Hock
feb571a4bf Fixed typos -- obejct should be object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 21:56:52 +00:00
Robin Dunn
d612c25a3c Added missing GetCellSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 20:24:39 +00:00
Robin Dunn
1fc3b23ad7 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 20:22:46 +00:00
Robin Dunn
00b9c8672f Patch from Gordon Williams:
- Added bar graph demo
   - Modified line end shape from round to square.
   - Removed FloatDCWrapper for conversion to ints and ints in arguments


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 20:15:55 +00:00
Ryan Norton
5ed2e1386e revert change to bakefiles as per Robin's suggestion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 20:07:33 +00:00
Robin Dunn
2a0495c9f7 FloatCanvas patch from Chris Barker.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 19:28:57 +00:00
Julian Smart
c82be69b51 Applied patch [ 1039456 ] [wxOS2]Popup menu problems
By Dave Parsons
Fixes problems including:

titles do not display,
title id is already allocated to the menu separator,
menus show in totally the wrong position,
possible to call DoPopupMenu with out of range parameters,
showing a menu enters an infinite loop with 100% cpu usage,
ProcessEvent is called destroying the return value from
HandleMouseEvent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 18:35:50 +00:00
Ryan Norton
004a805d3d some preparation for carbon/cocoa interop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 18:32:25 +00:00
Robin Dunn
7c9b5f42f5 Correct compile errors in non-unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 18:08:05 +00:00
Ryan Norton
3da9181eb4 I guess I should update this - :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 18:06:49 +00:00
Ryan Norton
3e90a0abcb another stub for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 17:56:59 +00:00
Ryan Norton
c58ae5f298 fix a bunch of warnings in unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 17:45:04 +00:00
Ryan Norton
207bc66c38 remove blatant hack from configure and do proper checking for stuff wxCocoa does not support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 17:22:56 +00:00
Robin Dunn
bf47e3986a Verified and applied [ 1042133 ] GTK2.0: DrawRotatedText dumb implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 17:05:30 +00:00
Ryan Norton
422d306cb3 1. Yet another unit test for new stirng stuff
2. Fix unicode and 10.2 in src/cocoa/app.mm
3. Fix error in doc about wxEvtHandler::Connect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 16:50:24 +00:00
Julian Smart
d2b1753d16 Applied patch [ 1039940 ] Prevent redefinition of MM_xxx mapping mode constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 16:42:11 +00:00
Julian Smart
fd76d9633a Applied patch [ 1039953 ] Fix notebook functionality in widgets sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 16:38:48 +00:00
Julian Smart
2006289b74 Applied patch [ 1042241 ] Fixes print setup problem (MSW UNICODE build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 16:32:20 +00:00
Julian Smart
a527830a2e Applied patch [ 1042241 ] Fixes print setup problem (MSW UNICODE build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 16:26:58 +00:00
Włodzimierz Skiba
373a5fb355 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 13:36:41 +00:00
Włodzimierz Skiba
b4e0b521e0 Late note about deprecated wxDbTable constructor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 13:04:53 +00:00
Dimitri Schoolwerth
3246bafdcf fixed Carbon compilation; call HID keyboard dtor for Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 11:26:32 +00:00
Ryan Norton
bb27b37262 revert badly screwed up commit :\
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 09:01:23 +00:00
Ryan Norton
dcb6810279 2.5.3 - cleanups, fixes, etc. etc. -
1. Various stubs for wxCocoa (and the bakefile entries for them)
2. Definitions for some wxCocoa cocoa types in defs.h
3. Hack to attempt to fix SYNC sound for mac carbon
4. Fix for wxCocoa and 10.2 (Dave - I'm already around doing some stuff anyway - I'll go ahead and save you the trouble).
5. 10.2 unicode layer
6. Strings null-char fixes (stems from chartraits patch - essentially the patch minus the chartraits part - HAHA :)) [note to self - swap the 2nd and 3rd params of wxMemchr if you use chartraits and vice versa]
	* If you have time please run the strings and stdstrings cppunit test suite
	* Also add more test suites if you want - more is always better :)
	* This does not include any fixes for mbtowc etc functions as outlined on the ml

7. An attempt to update wxArray docs a little
8. wx/process.h build fix for wxCocoa
9. Unicode fixes in app.mm for wxCocoa
10. Remove newer font panel after Stefan's suggestion


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 08:53:48 +00:00
Julian Smart
685cdfcb9e Misc script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 07:52:25 +00:00
Ryan Norton
c228d3a4c2 cache mac and cocoa builds - so if you pick cocoa one time and don't specify it the next it will properly go back to cocoa, not default to mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 01:59:46 +00:00
Ryan Norton
5558135c48 cursors for cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 22:11:46 +00:00
Robin Dunn
f744f3456c New directories added, old ones removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 21:55:43 +00:00
Robin Dunn
b6536d60cf Install tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 21:54:49 +00:00
Václav Slavík
f3d618fdde fixed broken DoUpdateWindowUI: event.SetChecked doesn't have to be used together with SetText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 21:49:40 +00:00
Ryan Norton
2619179042 cocoa tooltips. Remove runtime warning from 10.2 (dave - I was too lazy to change this from my local copy, feel free to commit over this if you want)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 21:09:47 +00:00
Włodzimierz Skiba
39d350d692 Blind fix to lack of sql types.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:58:46 +00:00
Włodzimierz Skiba
925e9792d3 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:54:57 +00:00
Włodzimierz Skiba
958d3a7e4b Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:32:05 +00:00
Włodzimierz Skiba
907173e51d Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:21:57 +00:00
Włodzimierz Skiba
c0c997853f Keys to some operations (patch #1037434).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:11:24 +00:00
Włodzimierz Skiba
716dc24570 Removed doubled events, corrected behaviour (patch #1037434)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:09:34 +00:00
Václav Slavík
67aa6c1ee6 added reference to GetUnicodeKey to GetKeyCode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 19:46:11 +00:00
Robin Dunn
8412feb028 Show EVT_ACTIVATE and EVT_ACTIVATE_APP events in action.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 18:34:20 +00:00
Robin Dunn
2e0ae50eca A Python version of wxrc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 18:32:25 +00:00
Robin Dunn
c0e1f6b66e Mention TaskBarIcon and other recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 18:30:24 +00:00
Robin Dunn
9d617682ab Remove any old wxrc before installing new ones. This fixes a make
error on OSX.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 18:10:22 +00:00
Robin Dunn
21131143d5 wxMDIChildFrame::IsTopLevel returns false but for this purpose we
should use the MDI Child, not it's parent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 17:04:05 +00:00
Kevin Hock
e59461fff5 Expanded comment in Initialize to include why Initialize is needed on OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 16:25:33 +00:00
Kevin Hock
7725dc7c0a Mac sockets events must be added to the RunLoop in the main thread, very similar to MSW. OnInit will now statically store the main RunLoop when wxSocketBase::Initialize is called (which should be called from the main thread), allowing sockets to be created in secondary threads and still receive events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 16:20:50 +00:00
Kevin Hock
262ce38a2a Added back compile-time check for about/prefs menu separator; OS 9 should not have this separator appended. Can be changed later if needed to run-time check. This is better than nothing before 2.5.3.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 16:15:30 +00:00
Stefan Csomor
0bf1e7cb96 adjusting DoGetBestSize according MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 11:53:07 +00:00
Vadim Zeitlin
27db421056 cleaning up strdup/isascii definitions for compilers which lack them (should fix CW CFM build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 21:57:40 +00:00
Robert Roebling
3c4e4af64e Make wxComboBox spit out a bit fewer surplis
events when holding down the mouse button.
 Enable key based navigation through notebook
   tabs as in the native control with Left and
   right keys. Support for vetoing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 21:11:18 +00:00
Robin Dunn
5f24651b5c Deprecated EVT_LIST_GET_INFO and EVT_LIST_SET_INFO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 20:53:01 +00:00
Robin Dunn
82bd61672d Typedef for wxUIntPtr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 20:52:20 +00:00
Robin Dunn
45c82204b9 Added wx.App.IsMainLoopRunning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 20:51:43 +00:00
Ryan Norton
d2518be484 default pos/size cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 19:17:48 +00:00
Robin Dunn
d5a0636fa0 Improve image hittest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 18:24:13 +00:00
Robert Roebling
576f712776 Fixed missing focus problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 16:17:21 +00:00
Václav Slavík
a565f84b6f added wxRB_SINGLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 15:42:37 +00:00
Włodzimierz Skiba
254a21292b Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 15:38:40 +00:00
David Elliott
908686c52e Implement wxBitmapButton::DoGetBestSize() to call wxButtonBase version so
that the newly implement wxButton::DoGetBestSize() is not used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 01:50:17 +00:00
David Elliott
635f01472e Implement wxButtonBase::GetDefaultSize()
Implement wxButton::DoGetBestSize() to return at least 68 pixel width unless
wxBU_EXACTFIT flag is given.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 01:49:05 +00:00
David Elliott
d1adc25737 Added wxAutoNSAutoreleasePool where needed for controls sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 23:47:49 +00:00
Włodzimierz Skiba
8f6eaec925 Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland, DigitalMars and MinGW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 20:25:15 +00:00
Vadim Zeitlin
9b0db4529f made IsMainLoopRunning() static and implemented it for wxAppConsole too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 20:21:44 +00:00
Robin Dunn
30bbdf96e5 fix compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 20:06:35 +00:00
Włodzimierz Skiba
44e0daa1d2 Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland, DigitalMars and MinGW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 20:03:27 +00:00
Włodzimierz Skiba
0203c8cd67 Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland, DigitalMars and MinGW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 19:47:55 +00:00
Robin Dunn
890976b89f Bail out if GetCurrentMenu returns NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 19:28:13 +00:00
Julian Smart
3134f9338b Typo corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 16:11:04 +00:00
Ryan Norton
190c958182 native wxFontDialog for carbon, second shot
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 15:36:28 +00:00
Dimitri Schoolwerth
a8d628fcc5 added missing include for non-PCH compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 15:23:43 +00:00
Włodzimierz Skiba
f510b7b2f3 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors. Content and links to TCP/DDE/Base Server/Client/Connection in correct places.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 15:13:52 +00:00
Vadim Zeitlin
90fc4a0ccb don't use non blocking sockets if wxApp::IsMainLoopRunnning() returns false (closes 994293)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 10:52:32 +00:00
Vadim Zeitlin
5f4f5b58f6 added wxApp::IsMainLoopRunnning() (see bug 994293)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 10:51:11 +00:00
Vadim Zeitlin
9413911860 added tests for deleting and renaming entries and groups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 10:38:08 +00:00
Vadim Zeitlin
6dda7a7521 assert that name, not full path, is used in RenameEntry(); fixed RenameGroup() which was completely broken for groups with subgroups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 10:37:45 +00:00
Vadim Zeitlin
701fb11eb5 fixed deletion of last group in the config file (bugs 849088 and 902147)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 10:18:11 +00:00
Vadim Zeitlin
c8adf5ef39 don't try to delete our config file in DeleteAll() if we don't have any; don't assert when trying to delete an entry which doesn't exist (for consistency with DeleteGroup() and wxRegConfig)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:53:23 +00:00
Vadim Zeitlin
45d51f194a don't add dummy empty line at the end when reading from stream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:42:58 +00:00
Vadim Zeitlin
4c420a80e0 small optimization in wxConfigPathChanger: don't change the path if it is already the same as requested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:29:15 +00:00
Vadim Zeitlin
384198de1b forward declare wxOutputStream (compilation fix for !USE_PCH)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:28:14 +00:00
Vadim Zeitlin
835fab506e blind warning fix in wxUmaskChanger
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:26:55 +00:00
Vadim Zeitlin
9db6158ab8 added SetPath(), entries and groups enumerations tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 08:24:28 +00:00
Ron Lee
fdefae196a Clean up the soversion/flavour labelling of binary runtime packages.
Split out a common wxPython package so the runtime support for it
doesn't need to conflict any more either.

Makefile.in was apparently committed from out of date bakefiles
so it is included here again too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 05:14:55 +00:00
Dimitri Schoolwerth
8f7fa6f8f9 removed tab character
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 23:46:42 +00:00
Vadim Zeitlin
17c24d37c6 started wxFileConfig unit test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 23:17:19 +00:00
Vadim Zeitlin
a121d72052 added wxFileConfig::Save(stream); documented it in new, separate from wxConfig, wxFileConfig doc file (replaces patches 902372 and 900889)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 22:55:08 +00:00
Vadim Zeitlin
e1cc687422 don't keep a dirty flag in each entry/group, this is totally wasteful as a single flag in wxFileConfig itself is enough; do reset the dirty flag after Flush()ing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 22:34:09 +00:00
Vadim Zeitlin
608299859d use wxFileName::MacSetTypeAndCreator() in Flush() instead of duplicating its code here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 22:18:27 +00:00
Vadim Zeitlin
8482e4bdb9 added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicating the same umask-setting code in several places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 22:12:58 +00:00
Václav Slavík
a761df69a3 fixed menu destruction if it was removed from menubar with Remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 21:00:45 +00:00
Václav Slavík
e25c7537ff fixed transiency when the parent is MDI child frame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 19:38:32 +00:00
Julian Smart
bdacb147ee Workaround for special menu items not always being enabled. Use
with UI update events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 18:06:15 +00:00
Václav Slavík
7fbe5489ad fixed crash on invalid data (patch 1039453)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 16:31:58 +00:00
Vadim Zeitlin
7d9bf1f11c don't include headers not needed when wxUSE_GUI == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 16:10:46 +00:00
Robert Roebling
06fda9e808 Reworked TLW and app activation event code, also
moved it to toplevel.cpp where it belongs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 14:13:48 +00:00
Vadim Zeitlin
e5d4ef7410 store bitmap data in premultiplied by alpha format in wxBitmap/wxDIB (patch 991172)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 14:03:52 +00:00
Vadim Zeitlin
57c26f8210 use AlphaBlt() when blitting to a bitmap with alpha channel too (patch 991166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 13:53:33 +00:00
Vadim Zeitlin
a6fd0fde4c update the disabled buttons appearance when system colours change (followup to patch 1027243)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 13:46:11 +00:00
Vadim Zeitlin
8093538cc5 oops, AdjustFontSize() had no effect; fixed (patch 1037952)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 13:38:22 +00:00
Vadim Zeitlin
6d067eb66a Metrowerks fixes after huge file patch (patch 1037951)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 13:36:46 +00:00
Ron Lee
6a9046db1e Use the same paranoia we already apply to lib lists we get from configure
to those we get from the user on the command line.  Bubble all duplicates
to occur at their last mention so static linking order is satified.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 12:13:02 +00:00
Vadim Zeitlin
0746037046 destroy any TLWs still alive when the app terminates (avoids problems with classes unregistering under MSW and memory leaks everywhere)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 12:11:19 +00:00
Julian Smart
2a3476f24d Updated version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 09:57:15 +00:00
Vadim Zeitlin
74c719ed96 fixes for Metrowerks command line compiler (avoid redefining stuff already defined by configure)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 23:19:07 +00:00
Vadim Zeitlin
413a490f94 Metrowerks doesn't have isascii()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 23:17:23 +00:00
Vadim Zeitlin
b5172775cf $#include "expat_config.h" instead of <expat_config.h> as the file is in current directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 23:16:18 +00:00
Václav Slavík
559f532de1 don't cd into utils/xrc if USE_XRC=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 22:10:44 +00:00
Václav Slavík
c62d80605f don't cd into utils/xrc if USE_XRC=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 21:55:11 +00:00
Vadim Zeitlin
bc525d0038 removed non-const wxDC accessors for pens, brushes, ... (bug 1039169)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 21:30:00 +00:00
Vadim Zeitlin
b17f6a307a only use __attribute__(regparm) for x86, this results in warnings under other platforms (e.g. PPC)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 20:52:53 +00:00
Vadim Zeitlin
ba3d13e1c8 use AC_LINK to check for va_copy, not AC_COMPILE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 20:31:34 +00:00
Ryan Norton
6a8b0d4586 warning for 2.5.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 19:19:55 +00:00
Vadim Zeitlin
8fa53e0eee added tests for va_copy and va_list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 18:33:34 +00:00
Vadim Zeitlin
d85cfb3784 added wxVaCopy() and use it to fix wxVsnprintf() crash (see bug 1017651)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 18:32:31 +00:00
Vadim Zeitlin
ebb97a41da fixed dll import specification of wxGetHInstance()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 16:21:38 +00:00
Vadim Zeitlin
57e075e99a removed trailing comma from enum (gcc 3.4 compilation fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 16:12:15 +00:00
Václav Slavík
3747d6c0d5 generated resources code doesn't have to include <wx/wx.h>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 15:30:32 +00:00
Julian Smart
843b368a06 Blind fixes for Mac project files (version number, missing cpp files)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 14:07:20 +00:00
Václav Slavík
749bfe9a6d compilation fixes for gcc-3.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 12:36:02 +00:00
Václav Slavík
d2ec8d8488 don't link GUI libs into wxrc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-02 12:34:29 +00:00
Robin Dunn
0297af1520 Fixed typo, patch from Will
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 18:14:20 +00:00
Ron Lee
22642fb2b8 Filter any arguments back to 2.4.2.6 syntax before
handing them on to a legacy wx-config.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 16:10:54 +00:00
David Elliott
509dcc4b80 wxCocoa needs OpenGL/*.h instead of GL/*.h (for OpenGL.framework includes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 14:26:19 +00:00
David Elliott
bd2af42857 wxCocoa: Added (mostly) stubs for wxGLCanvas and friends.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 14:23:59 +00:00
Ron Lee
5173779ec4 Add wxversion/ to the dist tarball.
Prefer 2.5 wx-config in the debs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 14:02:27 +00:00
Ron Lee
a13a7f891a Add support for legacy 2.4 installs to wx-config.
Add /utils/wxrc to the dist target and fix some things that still
think it is in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 13:28:25 +00:00
Ryan Norton
10c5f652b9 fix const to normal warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 12:40:59 +00:00
Václav Slavík
f987cbb173 use default GUI font in wxHtmlListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 11:27:43 +00:00
Václav Slavík
62b45e0694 gcc-3.4 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 11:20:46 +00:00
Chris Elliott
fa24326ff0 update script to use vars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 10:47:28 +00:00
Ryan Norton
2d347ce894 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 03:14:30 +00:00
Ryan Norton
dcac15653e OSX only (a runtime check would be preferable as Kevin mentioned
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 03:09:42 +00:00
Kevin Hock
326d5a744f Increase status bar height from 15 to 18, allows common 16 x 16 icons and other controls like checkboxes to fit better without special handling (at least until Mac statusbar can determine its own best height)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 02:50:27 +00:00
Ryan Norton
23c6ddc89c only do the seperator between about and preferences on 10.3 and up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 02:49:16 +00:00
Kevin Hock
e957d41c73 wx apps did not have the separator like other apps after About--now they do
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 02:08:41 +00:00
Ryan Norton
cea9c5b1ba fix dialogs sample after change to generic on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 01:57:31 +00:00
Vadim Zeitlin
29e92efbe7 hack: hide the MDI parent frame by moving it off screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 01:51:29 +00:00
Vadim Zeitlin
a4f01f0592 relayout frame contents when tool/statusbar is shown/hidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 01:49:45 +00:00
Vadim Zeitlin
5e62d4a5c7 extracted OnSize() body in a new DoLayout() method so that it can be called from wxFrame::SetXXXBar()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 01:46:14 +00:00
Robin Dunn
6ad75f5393 no need to build separate xrc lib anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 23:20:20 +00:00
Robin Dunn
5e4835243a reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 23:18:30 +00:00
Robin Dunn
94bc006bd2 Correct call to shape.Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 23:12:29 +00:00
Vadim Zeitlin
aba3d35e7b don't deprecate SetItemImage() with 3 parameters; just add a default value for the last one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:27:45 +00:00
Václav Slavík
e30fbc5234 build and install wxrc by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:20:34 +00:00
Václav Slavík
c6a726f1ce removed remaining XRC files from contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:19:49 +00:00
Václav Slavík
ea5dbc97a3 wxrc is in core utils now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:17:55 +00:00
Václav Slavík
25f7985e47 install wxrc as wxrc-2.5, with symlink
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 22:15:39 +00:00
Václav Slavík
9c52a42951 blind compilation fix for MSVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 21:52:39 +00:00
David Elliott
696e933166 Use struct qualifier with objc_object (it is and always will be a struct)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 21:00:18 +00:00
Robin Dunn
c0b26bc2be Don't need to tickle the Idle process any more for taskbar icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 19:40:24 +00:00
Julian Smart
3614a8dc02 Deprecations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 19:13:38 +00:00
Julian Smart
c3627a004d Deprecated SetItemImage with 2 image ids
Deprecated _GET_INFO, _SET_INFO list control events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 19:12:23 +00:00
Julian Smart
7f9975410f Applied patch 1037938 by Zbigniew Zagorski to fix Unicode build problems
in Tex2RTF HTML generation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 18:41:55 +00:00
Václav Slavík
571f6981e2 moved wxWindow::GetBestSize implementation into DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 16:37:58 +00:00
Václav Slavík
024f89f972 moved wxWindow::GetBestSize implementation into DoGetBestSize to make it easier to support both prototypes in derived classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 16:33:36 +00:00
Robin Dunn
147d666989 Fix for crash when the child has no menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 16:33:15 +00:00
Václav Slavík
c10d3a5471 resize parent's frame client area correctly when statusbar is added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 16:32:19 +00:00
Julian Smart
258bcbfbd3 Blind fix for missing files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 14:54:20 +00:00
Julian Smart
5f61ac87dc Added XRC project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 14:47:41 +00:00
Ryan Norton
af7e08a4a5 have it work the old way with PopupMenu(), and have it restore the old menu on destruction (and hopefully when RemoveIcon() is called
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 13:51:00 +00:00
Włodzimierz Skiba
b236c10f77 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 11:15:59 +00:00
Vadim Zeitlin
12f9921085 compilation fix for wxGetEmptyString() with wxUSE_STL == 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 08:23:28 +00:00
Robin Dunn
1c97259a91 A better fix for GetXWindow that can handle both the wx widgets and
the native widgets.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-30 01:17:18 +00:00
Robin Dunn
1d451c5bd1 wxSystemSettings::GetMetric returns -1 if the metric is not supported
by the port.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:56:22 +00:00
Robin Dunn
49090f6f10 Change which image is used in the taskbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:52:45 +00:00
Robin Dunn
bbfc7289d6 Stop the timer before closing the demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:51:24 +00:00
Robin Dunn
1cc18e15f4 Overridable CreatePopupMenu in TaskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:24:10 +00:00
Robin Dunn
662bd31e12 Overridable CreatePopupMenu in TaskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:18:28 +00:00
Václav Slavík
2596e9fb2c fixed flicker during MDI children creation: the frame is now created hidden and shown in idle time to maintain backward compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 21:07:48 +00:00
Robin Dunn
e768548a12 Create a mask for the icon if it doesn't already have one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 20:39:25 +00:00
Julian Smart
3444e4a8f9 Fixed case sensitivity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 17:53:43 +00:00
Vadim Zeitlin
f530fa27a9 fixed memory leak in Submit(cmd, false) (bug 1037115)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 17:17:27 +00:00
Robin Dunn
c4dc4cdd5a Just return zero without failing for unknown metrics, like the other
ports do.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 16:49:01 +00:00
Robin Dunn
3bc06221f0 off_t --> wxFileOffset changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 16:42:36 +00:00
Julian Smart
f525dc35f4 Temp fix for VC6/XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 16:21:47 +00:00
David Elliott
164f091f4b Get the stock label when stock ID is used with empty label in Create()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 16:07:12 +00:00
Václav Slavík
66370e3854 implementation should use DoFindFocus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 15:30:09 +00:00
Václav Slavík
0fe0275981 changes to make wxWindow::FindFocus work as expected with composite controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 14:34:28 +00:00
Julian Smart
adfea104dc Applied patch [ 1036833 ] Hiding declaration of wxScrollHelper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 14:02:24 +00:00
Julian Smart
a65abcfdeb Increased a buffer size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 13:29:48 +00:00
Włodzimierz Skiba
f0e8a2d077 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 11:25:34 +00:00
Vadim Zeitlin
4be927a2d0 signed/unsigned comparison warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 11:16:22 +00:00
Vadim Zeitlin
02a525b385 removed C++ comments from C files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 10:42:37 +00:00
Włodzimierz Skiba
9ca7505f12 wxTLW::SetLeft/RightMenu of smart phones documented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 09:46:26 +00:00
Vadim Zeitlin
81ce36aa59 more 64 bit correctness fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 09:25:47 +00:00
Ron Lee
7714864e2f Update the wx-config man page.
Remove some cruft from the docs package.
Bump version in configure.
Update aclocal.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 09:07:08 +00:00
Ryan Norton
1a6a834724 remove unfinished sample for release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 08:20:14 +00:00
Włodzimierz Skiba
9b1414681c Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 08:03:26 +00:00
Julian Smart
927330abae Incremented version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 07:48:17 +00:00
Ron Lee
5f74359ff8 Update odbc for parallel installs too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 07:36:34 +00:00
Włodzimierz Skiba
d4c25daa1b C++ removed from C syntax.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 07:21:18 +00:00
Włodzimierz Skiba
d109c5849e Include missing.h to find O_* flags.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 05:44:37 +00:00
Włodzimierz Skiba
285f605a41 Correction to lost #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 05:42:47 +00:00
David Elliott
a1f4186efa wxStaticBox constructor is not supposed to take a wxValidator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 05:18:38 +00:00
Ryan Norton
9795bd2ee4 drawer sample mods from ABX (with only one mod - _CODE Added to #define USE_DRAWER 0)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 04:28:42 +00:00
Robin Dunn
b6294124ec reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:22:24 +00:00
Robin Dunn
9a9942f75a Allow embedded double quotes, and hex-encode single quotes. Makes the
typical case a bit more readable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:20:27 +00:00
Robin Dunn
b27a4ef40d Updates for how the Python code is generated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:15:21 +00:00
Kevin Hock
5b884f4c74 Send EVT_COMMAND_TEXT_UPDATED from the spin control when the text in a spin control is updated by typing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:14:29 +00:00
Robin Dunn
1a014e5080 Version number bump
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:11:58 +00:00
Robin Dunn
d48c1c640e Beginings of supporting multiple versions installed side-by-side
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 00:11:17 +00:00
Robin Dunn
dc8005e206 TRUE/FALSE/etc. cleanup in the *.in files, regenerated the .h and .cpp
files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 23:36:33 +00:00
Kevin Hock
163c36827d When enabling events, use CommonModes instead of DefaultMode for the RunLoop. In use locally since January, indicated as better mode setting by Dave E.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 23:23:21 +00:00
Vadim Zeitlin
0d01dd512f wxListItem::m_data is now of type wxUIntPtr, not long, for compatibility with 64 bit systems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:53:19 +00:00
Vadim Zeitlin
1695e2851d added wxPtrToUInt() to cast pointer to an integer type without warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:48:47 +00:00
Vadim Zeitlin
4ebb542f72 added HAVE_REINTERPRET_CAST detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:46:05 +00:00
Vadim Zeitlin
4eeb39ab7c added AC_CXX_REINTERPRET_CAST
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:44:59 +00:00
Vadim Zeitlin
8c8d66c5f0 added wx_reinterpret_cast() macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:44:10 +00:00
Vadim Zeitlin
b41f29c357 suppress VC7.1 64 bit correctness warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 21:16:57 +00:00
Robin Dunn
d22956def7 off-by-one fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 19:49:00 +00:00
Robin Dunn
ec865862e4 Corrected compile warnings, took out debug printf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 19:24:58 +00:00
Robin Dunn
8e3ca43b37 Patch from Alberto Griggio to use the wxRenderer for drawing the
header and buttons, plus some tweaks from me to calculate the height
of the header based on font size.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 18:59:28 +00:00
Włodzimierz Skiba
3180bc0e63 Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 18:17:07 +00:00
Włodzimierz Skiba
8300f815fa Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 17:39:16 +00:00
Julian Smart
32025be9de Duplicate wxLC_VIRTUAL removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 17:30:00 +00:00
Włodzimierz Skiba
9a35701127 Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 17:29:37 +00:00
Włodzimierz Skiba
0c44ec9737 Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 17:13:15 +00:00
Robin Dunn
d531898b10 Patch from Victor V. Kryukov
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 16:46:43 +00:00
Włodzimierz Skiba
5b33ae84fd Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 16:32:06 +00:00
Włodzimierz Skiba
57ff58bd13 Hardware defines spec. Their application to the sources will take more commits since it not always as easy as it seems when they are part of more complicated conditions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 16:11:04 +00:00
Julian Smart
4566d7db6f Improved the generic font dialog appearance.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:46:17 +00:00
Ryan Norton
154ad28bb3 possibly fix compilo error w/xcode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:41:27 +00:00
Ryan Norton
641b395201 Fix some bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:24:48 +00:00
Włodzimierz Skiba
7e126a0784 Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:13:27 +00:00
Ryan Norton
8a68e8dbbe remove unfinished impl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:02:56 +00:00
Ron Lee
148e141b23 Enable concurrent installs of runtime packages after a soname change.
Add a common package for afm metrics, and other 'static' data and utilities.
Remove the version/flavour from afm installs on unix as discussed with Vaclav,
these files really do never change.
Mention --static along with other selection options in --help.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 14:47:08 +00:00
Julian Smart
fde692b5ad Use generic font dialog on MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 14:28:22 +00:00
Vadim Zeitlin
c4761f668a wxFile::Length() return type fix (replaces last check in)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 12:05:29 +00:00
Włodzimierz Skiba
dcbd177f06 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 11:54:59 +00:00
Julian Smart
cf70008883 Typo corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 10:32:34 +00:00
Vadim Zeitlin
07170120ee blind fix for wxGetEmptyString() compilation with wxUSE_STL == 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 09:50:23 +00:00
Ryan Norton
6d3ef2255e fix unicode stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 09:24:48 +00:00
Julian Smart
45d9ef07d1 Removed fcntl.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 08:01:31 +00:00
Julian Smart
08c6324095 __WINCE__ -> __WXWINCE__
Added missing O_... symbols
Incremented the version


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 07:45:37 +00:00
Ron Lee
3950ea80e8 Make the warnings a little more relevant in other contexts
in which they may be seen.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 04:30:39 +00:00
Robin Dunn
28e0c28ee3 On the Mac the Alt key is a character modifier like Shift, so let char
events with AltDown proceed into Scintilla.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 00:13:53 +00:00
Ryan Norton
1553abf415 source nice-ness and remove erronous files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 23:19:24 +00:00
Ryan Norton
1751226cbf revert bad change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 22:46:16 +00:00
Robin Dunn
8674d3b5d4 fix link errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 21:35:44 +00:00
Robin Dunn
5ee1d7604b Allow style spec strings to contain colour names as well as hex values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 21:17:01 +00:00
Julian Smart
65df77ec74 Don't try to typedef off_t twice (eVC++)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 21:08:54 +00:00
Vadim Zeitlin
8b0975a38e code cleanup for the pen width condition (patch 1034942 + more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 21:02:57 +00:00
Julian Smart
a951722b6a Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:55:59 +00:00
Vadim Zeitlin
ae177b45b2 set click coordinates to (-1, -1) if right mouse button event was generated from the keyboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:52:10 +00:00
Vadim Zeitlin
1eef64d836 initialize m_reusable (patch 1035725)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:51:19 +00:00
Robin Dunn
2d0c2e79c2 Fix for probably rare but potential refcount leak.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:46:44 +00:00
Robin Dunn
c13c38d484 Oops, forgot to remove some whitespace and to sort the list of files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:40:24 +00:00
Robin Dunn
591d01beba Updated wxSTC's copy of Scintilla to version 1.61
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 20:29:49 +00:00
Włodzimierz Skiba
318c5e9fa5 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:24:45 +00:00
Włodzimierz Skiba
d1da887276 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:15:07 +00:00
Włodzimierz Skiba
6953da0088 Source cleaning: whitespaces, tabs, -1/wxID_ANY, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:06:39 +00:00
Robin Dunn
2e5cc335a7 Added IsActive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:00:20 +00:00
Robin Dunn
c5f01deabb Added FontFromPixelSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 18:59:10 +00:00
Vadim Zeitlin
5a2ec1b841 explicitly forward declare wxHashTableBase when wxUSE_STL == 1; this is apparently needed for xlC (AIX compiler)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 18:19:22 +00:00
Włodzimierz Skiba
1239ac2e28 Watcom fixes after recent wxFile changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 17:27:41 +00:00
Vadim Zeitlin
fb3c904254 fix crash when calling wxGetEmptyString() with wxUSE_STL == 1 (bug 1028804)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 17:20:55 +00:00
Włodzimierz Skiba
3e79fa7534 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 16:01:38 +00:00
Vadim Zeitlin
06e66bd0ca define wxInvalidOffset properly (as wxFileOffset, not off_t)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 14:33:51 +00:00
Ryan Norton
0836924e6b remove stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 14:20:01 +00:00
Ryan Norton
344d48020e [ 1035247 ] fix the number of ticks in slider (with annotations)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 13:57:34 +00:00
Ryan Norton
71622a6899 use both generic and native on osx 10.2 for presentation purposes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 13:14:22 +00:00
Ryan Norton
5dcf30a03f IOKit framework now req. under darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 13:07:39 +00:00
Robert Roebling
e11898f903 Compile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 13:06:30 +00:00
Vadim Zeitlin
944e8709b7 fix crash after radio button fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 13:01:12 +00:00
Julian Smart
9f4ccdd739 Early versions of GTK+2 don't have has_toplevel_focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 12:20:21 +00:00
Ryan Norton
ed7e3b9a69 make go generic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 11:44:29 +00:00
Ryan Norton
4a4a811163 generic (will comment on list later about was does/doesn't work) drawer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 11:32:05 +00:00
Vadim Zeitlin
a4e391f8e8 added src/msw/wince/filefnwce.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 11:30:03 +00:00
Vadim Zeitlin
ed7c11abc8 warning fix after huge file patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 11:29:12 +00:00
Vadim Zeitlin
df455719ff keep the old wxFont::Create() signature (changed by font size in pixels patch) to fix XTI and to preserve backwards compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 11:02:11 +00:00
Vadim Zeitlin
77d8d6cd64 added wxGetFullModuleName(); use it instead of calling ::GetModuleFileName() directly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 10:58:32 +00:00
Dimitri Schoolwerth
95ae6d5fc9 doc-typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 10:55:56 +00:00
Dimitri Schoolwerth
0f9dff88e5 doc-typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 10:34:39 +00:00
Dimitri Schoolwerth
c1ce7c1988 fixed MSVC6 warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 10:25:41 +00:00
Ron Lee
1320281c89 Handle the case of unresolveable ambiguity in --list now too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 08:08:02 +00:00
Ryan Norton
6be23c2a23 pass by reference, not value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 07:45:15 +00:00
Ryan Norton
342689c865 fix warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 07:42:40 +00:00
Ryan Norton
12fce8fb5e fix non-void function not returning value warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 07:33:40 +00:00
Ryan Norton
e9b41b24a0 Add HID keyboard functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 07:13:24 +00:00
Stefan Neis
80a07196b3 Re-simplified ScrollWindow routine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 07:09:39 +00:00
Ryan Norton
c33fae85b0 Regen Bakefiles for OSX HID integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 06:53:08 +00:00
Ryan Norton
4a027aea7d note font dialog change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 06:45:36 +00:00
Ron Lee
9a09819ad9 Delay --list a little longer so we can indicate the best match
out of the general blob.  Format the output a little less ambiguously.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 05:57:14 +00:00
Ryan Norton
147078ca82 remove erronues xrc contrib sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 05:26:34 +00:00
Vadim Zeitlin
ae8e83cb39 made GetTempBuffer() static to avoid duplicate function errors during linking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 23:17:19 +00:00
Václav Slavík
7eb872f4d6 partially reverted Robert's changes, did it more cleanly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 23:08:01 +00:00
Vadim Zeitlin
2fd47df61e documented IsActive()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 20:45:11 +00:00
Ryan Norton
ec8bd3921c hid integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 20:35:45 +00:00
Vadim Zeitlin
115148f733 fix for __HUGEFILES_SUPPORTED definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 20:28:58 +00:00
Robert Roebling
45f410f227 Moved function from mslu to utils to make the
linker not complain about double symbols.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 20:01:35 +00:00
Robert Roebling
b057f88ab8 Trying hard to make things compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 18:13:18 +00:00
Kevin Ollivier
8f3b30d57a Fixes to remove compile warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 18:03:28 +00:00
Ryan Norton
4ac48ae210 cleanups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:41:26 +00:00
Stefan Neis
5d826f601a Make scrolling work better (without constantly refreshing whole screen).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:39:21 +00:00
Robert Roebling
59060b8cfa GTK1 compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:22:44 +00:00
Ryan Norton
f569809660 recall initial font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:22:30 +00:00
Ryan Norton
c0a6772a75 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:14:30 +00:00
Julian Smart
645b5bd6c0 Applied Kevin Hock's combobox patch for text update events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:14:07 +00:00
Ryan Norton
ffa561cf92 fix remaining bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 17:06:07 +00:00
Julian Smart
13a5a49f36 Program args fix for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:42:21 +00:00
Julian Smart
058a62b10d Tweaks to fix RTF contents (need newline at end of each class file)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:37:44 +00:00
Ryan Norton
810d800e3c fix font styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:34:12 +00:00
Vadim Zeitlin
5a9b59346b wxExecuteData is a struct, not class (warning fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:28:51 +00:00
Julian Smart
a646203a02 Improved libs.bmp file but shows too small in WinHelp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:21:13 +00:00
Vadim Zeitlin
63effd42ea include wx/wxchar.h after ctype.h to fix compilation problem with _T redefinition with CodeWarrior 9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 16:14:35 +00:00
Ryan Norton
10dc1363b5 default to native font dialog for 10.2+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 15:59:57 +00:00
Ryan Norton
884a1216ae add drawer sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 15:34:39 +00:00
Robert Roebling
fec195b2c1 Make mouseless use of wxListBox possible for non single style.
Make wxListBox report click on background.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 15:29:24 +00:00
Stefan Csomor
431a3edc64 updated project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 15:11:08 +00:00
Ryan Norton
329fa15121 revert to pre-drawer state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 15:03:57 +00:00
Vadim Zeitlin
6b30a44ed0 renamed HasFocus() to IsActive() to avoid confusion with FindFocus(); documented it; avoid code duplication in GTK1 version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:32:09 +00:00
Ryan Norton
801d040762 fix warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:28:21 +00:00
Ryan Norton
d22c8abecd fix facename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:22:54 +00:00
Robert Roebling
35ff90a0b3 Added wxTopLevelWindow::HasFocus() as discussed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:17:23 +00:00
Ryan Norton
72fcdc7570 native font dialog implementation for mac os x 10.2+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:13:26 +00:00
Stefan Csomor
7f17ac744d dependency fix for clipping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:08:19 +00:00
Stefan Csomor
b3231f0aaf unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:07:33 +00:00
Stefan Csomor
cf6bedce0e unicode fix for CW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:07:09 +00:00
Stefan Csomor
5b2693a76f fix for CW compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:05:48 +00:00
Stefan Csomor
5340966638 clipping for wxMac cleaned up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 14:05:31 +00:00
Vadim Zeitlin
e302e0c167 compilation fix for Unicode mode after huge file patch: Watcom is the only compiler to have a wide char version of struct stat as well as of the stat function itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 13:55:29 +00:00
Robert Roebling
2e2b69eece Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 13:35:13 +00:00
Ron Lee
4004775e5a Enable the huge files patch to build with mingw-cross.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 13:18:46 +00:00
Ryan Norton
6ea3ac58ea no reference to wxFont - you've got to be kidding! :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 11:52:11 +00:00
Ron Lee
88899f6b03 wxSize needs to be fully defined if we want to use it inline here.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 11:47:30 +00:00
Ryan Norton
b32c4204bc add drawer to taskbaricontest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 10:51:46 +00:00
Ryan Norton
a45beea1e3 Lots of fixes/cleanups for OSX taskbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 10:42:02 +00:00
Václav Slavík
6b5c56bd5f notify parent frame that client area changed when statusbar is destroyed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 10:26:21 +00:00
Ryan Norton
eab19a7c79 Fix some of vadim's compilation problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 09:14:58 +00:00
Stefan Csomor
2e7573f70e making newline fixes depending on the encoding of \n
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 09:06:37 +00:00
Ron Lee
a1bf307a46 Limit the influence of flavour more strictly to autoconf format.
Remove '-' and '.' from the $release tag for non autoconf platform.
This may like slightly finer tuning than that for some people.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 08:46:55 +00:00
Ryan Norton
cc3388ae63 cleanups, proper event handling/cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 08:27:15 +00:00
Ron Lee
ccd39c210a Remove contrib xrc bakefiles, else regen dies because the makefiles
for it no longer exist there.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 08:15:57 +00:00
Ron Lee
dd21ced8dc Restore WXBASEPORT for carbon. This is more than just a flavour
in all the ways mac is typically more than, so it can stay a mac'ism
until the easier platforms shake out.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 06:39:37 +00:00
Ryan Norton
01703fba23 info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 04:37:17 +00:00
Ryan Norton
5d6f01d726 todo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 04:23:16 +00:00
Ryan Norton
976b87167f Fix 10.2 focus issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 04:19:56 +00:00
Ryan Norton
45285a6238 they should be ints, not size_ts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 03:25:46 +00:00
Ryan Norton
359878c33e warning fixes unsigned->signed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 03:15:32 +00:00
Robin Dunn
b411df4a29 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 02:09:51 +00:00
Ryan Norton
976f924083 todos, cleanups, detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 01:57:38 +00:00
Ryan Norton
739e35e4fb cleanup image after application
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-26 01:27:25 +00:00
Robin Dunn
ae8162c88f reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:41:54 +00:00
Vadim Zeitlin
9342fdbe5e compilation fix for not MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:37:29 +00:00
Robin Dunn
c430d0dc64 Added wxFRAME_DRAWER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:31:31 +00:00
Robin Dunn
92956ab232 More True/False fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:27:41 +00:00
Robin Dunn
8dcf04a803 add xrc lib to core libs list for Win32 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:26:54 +00:00
Vadim Zeitlin
dcb139ff26 compilation fix for compilers not using PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:25:44 +00:00
Robin Dunn
020fb2eef9 Use the stc.h in the source tree for the dependency, not the installed one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:15:58 +00:00
Robin Dunn
b17dd4ceee Enable TaskBarIcon for Mac too. Some cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:14:11 +00:00
Robin Dunn
6dc48d382c forgot to reset m_iconAdded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:12:25 +00:00
Robin Dunn
a3f4cbd6c8 Force the output window to display at the begining of the app
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:11:03 +00:00
Robin Dunn
edda5768ab Use dummy class on Mac until wxEventLoop is implemented there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:09:57 +00:00
Robin Dunn
f2641bc2bf Add some missing methods to match other implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:05:13 +00:00
Robin Dunn
8998887c22 added some missing mac headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:03:53 +00:00
Vadim Zeitlin
544229d106 added a way to create fonts with specified pixel size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 23:03:44 +00:00
Vadim Zeitlin
6294ac2e91 support for huge files (patch 1002226)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 22:44:19 +00:00
Stefan Csomor
395480fb22 making returns in a line to always be \n (13 in CFM (mpwnewline) and 10 in Mach)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 19:47:15 +00:00
Václav Slavík
232ba4c332 compilation fix: only us-ascii is safe in sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 18:56:33 +00:00
Ryan Norton
7c19f4d292 fix for [ 805216 ] dirMac does not properly skip directories from kevin hock
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 18:41:50 +00:00
Ryan Norton
3f16885ef3 bug didn't happen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 17:36:18 +00:00
Ryan Norton
3e17bc3f73 wxDrawerWindow - [ 909351 ] Drawer window for OS X Carbon - somewhat heavily modified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 17:22:43 +00:00
Stefan Csomor
9469cc5a32 insert was not correctly implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 16:59:07 +00:00
Stefan Csomor
683e36bccc insert was not correctly implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 16:43:31 +00:00
Stefan Csomor
8e0f22c082 insert was not correctly implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 16:24:17 +00:00
Chris Elliott
1631916e47 fix an mdi crash on exit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 15:21:10 +00:00
Ryan Norton
1df420d62b more todos so I don't forget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 13:45:50 +00:00
Ryan Norton
607667fde8 mark changes. Mac OSX taskbar implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 13:36:07 +00:00
Vadim Zeitlin
0fdc1ca11e removed Robert Fendt as packager (at his request)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 12:12:10 +00:00
Václav Slavík
9b6ff3b37b removed XRC library from contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 12:10:15 +00:00
Ron Lee
0506bbbfdf Undo the link creation in builddir. contrib is still going to be
here for a while so there isn't much paydirt in working around the
problems on platforms with limited filesystems at this stage.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 11:56:48 +00:00
Ryan Norton
6af167618f note that I modified it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 05:58:56 +00:00
Ryan Norton
ae25e5cc8c Fixed GetLineLength and GetLineText for MLTE text controls - Fixed bug where it couldn't get the length or text of the first line (0) and sf bug 1030042 where subsequent lines to 0 would not include the first character. Added those tests to the text sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 05:50:36 +00:00
Robin Dunn
385721a888 NormalizeFontSizes --> SetStandardFonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 03:11:22 +00:00
Dimitri Schoolwerth
857069f07c added convience functions wxSizer::AddSpacer/AddStretchSpacer (plus Prepend and Insert variants) (previously implemented on 20040725)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 01:14:51 +00:00
Ryan Norton
8d1147f942 warning fix - only use the function in debug mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 00:14:55 +00:00
Ryan Norton
1cc549e58c warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 00:12:28 +00:00
Ryan Norton
cc9d56b036 Lots of release bugs fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 00:02:13 +00:00
Ryan Norton
bc57786b55 debug handling. More broken Apple 'goodness'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 23:47:19 +00:00
Ryan Norton
47bde6fb00 remove unused icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 23:18:16 +00:00
Ryan Norton
162d656dfc fix unicode build errors with 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 23:14:01 +00:00
Ryan Norton
01edebd0fe fix bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 23:02:09 +00:00
Ryan Norton
ce709481a8 whoops - I tabbed :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 22:34:53 +00:00
Ryan Norton
d496416391 quiet annoying GCC warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 22:27:55 +00:00
Ryan Norton
7c2779590d remove unused varaible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 21:48:54 +00:00
Ryan Norton
9d43ea9585 unused variable warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 21:39:19 +00:00
Ryan Norton
af4fc79bd4 partial aggregate warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 21:33:21 +00:00
Vadim Zeitlin
6028be3f39 trying to make GetData() return data format more clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 19:46:42 +00:00
Robin Dunn
ce102f9d50 Corected GetXWindow macro for wxGTK port. (Bug# 1033681)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 16:18:37 +00:00
Robin Dunn
84c8e900a6 Added missing setters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 16:13:30 +00:00
Ron Lee
ecd16d74ce Get rid of the symlink farm in $builddir too, contrib is here
to stay for a while.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 16:00:21 +00:00
Václav Slavík
2b2ba79b25 removed XRC library from contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 15:36:11 +00:00
Włodzimierz Skiba
cab1a6053d Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 14:32:35 +00:00
Włodzimierz Skiba
02161c7c81 wxUSE_*BOOK checks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 13:45:52 +00:00
Ryan Norton
80e3f46492 unused variable warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 12:25:57 +00:00
Włodzimierz Skiba
392751754e Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 10:57:56 +00:00
Václav Slavík
97722b262c documented return value of wxListCtrl::HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 10:05:26 +00:00
Václav Slavík
bfa7fb5268 uses system's default UI font in the help browser by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 09:56:13 +00:00
Václav Slavík
10e5c7eaa0 replaced NormalizeFontSizes with SetStandardFonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 09:55:10 +00:00
Ryan Norton
84fe931ddf Port syncronization, more wxUSE_XML/XRC fixes and typo fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 08:58:52 +00:00
Ryan Norton
9581c3c6dc more setup0.h wxUSE_XRC fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 08:31:04 +00:00
Ryan Norton
f33cb209bf MSW XRC define setuup.h handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 08:20:57 +00:00
Ryan Norton
4c2752843a note that drawpoint only takes into account pen color like the _other_ toolkit. Note for tracker bug [ 844761 ] wxDC::DrawPoint ignores pen size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 07:45:05 +00:00
Włodzimierz Skiba
a771da4036 Above 2.3.0 SetBitmap is still for owner drawn only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 06:27:15 +00:00
Ryan Norton
3c907f1a7f fix typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 06:06:09 +00:00
Ryan Norton
7488a05edb PATCH: [ 1033006 ] Fix: socket s timeout of < 1s doesnt work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 05:48:24 +00:00
Ryan Norton
8715d2d3c2 Add doc TODOs for wxVariant. You know, Convert wasn't documented _at all_, heh :).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 01:20:18 +00:00
Robin Dunn
4519a2d911 More True/False fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 00:11:19 +00:00
Ryan Norton
54d5abee41 OK - Robin's right, it is already a SOCKLEN_T
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:57:37 +00:00
Ryan Norton
c6dee7f728 GetId of wxTreeItemData returns a wxTreeItemId, not a wxTreeItem. From the wiki documentation buglets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:53:07 +00:00
Ryan Norton
54d50c6e1b wxT sample fix for regex docs - documentation buglet from wiki
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:38:05 +00:00
Ryan Norton
c805f6c3af Mention that some functions are virtual - I'm pretty sure I didn't get all of them - from the wxwiki documentation buglets where it mentioned MainLoop() wasn't virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:33:14 +00:00
Ryan Norton
1bd98e4150 Link to event handling overview in wxEvent - documentation buglet from wiki
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:25:07 +00:00
Ryan Norton
0bf9746652 Put include file for sizer classes in docs - documentation buglet from wiki http://wiki.wxwidgets.org/docs.cgi?q=buglets&target=wiki
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:17:12 +00:00
Robin Dunn
5f47669009 added missing default case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 23:06:03 +00:00
Robin Dunn
214b94848a Fix from Jed Burgess that correctly untoggles radio toolbar items when
another one in the same group is selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 22:39:24 +00:00
Ryan Norton
f31d9916c2 delightful typo fixed - it was indefontedly a spelling error :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 22:36:56 +00:00
Ryan Norton
7d065a0afe Fix warning on OSX - its on int on mac/msw and a socklen_t on others
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 22:09:34 +00:00
Robin Dunn
f565c05e6b Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 22:01:08 +00:00
Robin Dunn
fdf907adb6 wx.NO_BORDER style sets the bezel width to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 20:47:16 +00:00
Robin Dunn
41b78a7aaf revert a few of these back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 20:36:24 +00:00
Robin Dunn
a72f4631fe Update SWIG patch to output "True" ("False") in the autodoc string
when "true" ("false") is in the .i file.

Changed the .i files to use true/false to avoid collisions with any
True/False in headers that may be included.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 20:23:54 +00:00
Ryan Norton
f2ac038698 get rid of \\ macros and change See Also -> See also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 20:20:53 +00:00
Julian Smart
01a01d1084 Minor doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 19:36:28 +00:00
Ryan Norton
beb3c20c88 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 19:16:08 +00:00
Ryan Norton
38fc80aef7 wxGLContext docs, tidy up of some wxGLCanvas docs, add wxGLContext to classes list, and add gl classes to misc category
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 19:01:20 +00:00
Włodzimierz Skiba
cb719f2e29 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 18:20:56 +00:00
Ryan Norton
957f865c97 unused variable warning fix - move unused stuff to proper place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 17:28:20 +00:00
Ryan Norton
e6e1f5176e SOCKLEN_T handling for OSX - it seems to be defined as a size_t, when the parameters to the functions where it is handled is really an int (avoids multiple conversion warnings)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 17:17:43 +00:00
Robin Dunn
2ef752932b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 17:12:53 +00:00
Ryan Norton
255df092b3 remove unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 17:03:58 +00:00
Robin Dunn
38b97c15ac Moved xrc out of contrib and into the core source dir, just like in
C++.  It will now always be built.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 16:49:01 +00:00
Ryan Norton
96bbbe1be1 fix ifdef - its libpng not pnglib :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 16:23:53 +00:00
Włodzimierz Skiba
08f1d43873 Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 15:41:43 +00:00
Václav Slavík
0304adb195 fixed unresolved references with GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 14:03:58 +00:00
Włodzimierz Skiba
1f30c17645 wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 12:43:10 +00:00
Vadim Zeitlin
f7df21aadf don't free user data before sending wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, this prevents user from doing cleanup in his OnDeleteAllItems() handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 10:07:25 +00:00
Vadim Zeitlin
c68f590a2a hack to _really_ fix crashes in comctl32.dll when processing HDN_GETDISPINFO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 09:59:24 +00:00
Ryan Norton
5a0176957a quick comment fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 09:39:05 +00:00
Václav Slavík
621be1ec26 wxUSE_XRC implies wxUSE_XML now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 09:18:13 +00:00
Václav Slavík
d2ebf0b730 XRC needs wxXML, check it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 09:14:07 +00:00
Włodzimierz Skiba
d2cdad17e3 Smartphone native look and feel.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 08:39:47 +00:00
Ryan Norton
01168e9591 simple GetContext() and one other minor doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 03:35:07 +00:00
Robin Dunn
96d49f0eea Added limited support for wxEventLoop (you can't derive from a
wx.PyEventLoop version yet...)  Updated and moved the sample showing
how to replace the MainLoop to samples/mainloop/mainloop.py.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 01:02:00 +00:00
Robin Dunn
9213ca5d47 Made wxGTK's wxEventLoop::IsRunning a little more consistent with
wxMSW's and uninstall the idle handled like wxYield does so Pending
can eventually return false.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 00:58:21 +00:00
Robin Dunn
ba3834927e plug memory leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 00:53:30 +00:00
Robin Dunn
cd5cb880d0 Fixes for bug #1031151 and #1031239
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 00:43:47 +00:00
Ryan Norton
da86e17765 wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 21:23:46 +00:00
Robert Roebling
eccd56020f Small fix for tabbing into wxListBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:57:09 +00:00
Ryan Norton
a76fd371f7 Only include/build pnghand if the user builds the png library (avoids multiple build errors)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:47:23 +00:00
Ryan Norton
699e27dc99 Fix aggregate has a partly bracketed Unmatched initializer warnings - which means that the compiler can't figure out which types the initializer list refers to - so now we're telling the compiler that the first and second 16 values do refer to the Bit16s and the last two values refer to the Point part of Cursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:30:58 +00:00
Ron Lee
9103d280f9 Install the config files for cross debs under /usr/$(host), but link them
to the default system location under /usr.  This way the commands:
wx-config --prefix=/usr/$(host) and wx-config --prefix=/usr --host=$(host)
are much more congruent in their action.

Another nail in the coffin for inplace hacks.  Link $srcdir/include to
the build dir so that --prefix=$build_dir really does point to a
realistic looking installed development environment.  I don't know why
I didn't do this instead of (ab)using --exec-prefix to 'fix' this
simple omission for so long.  Probably because it is much more obvious
if contrib is out of the picture.  That makes it a little more work
right now, but long term this is a very clean and correct thing to do.
It completely absolves us of the two independent variables problem,
and of the tree becoming bogus without actually being stale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:29:51 +00:00
Ron Lee
589e20d03c Move the WX_FLAVOUR variables to be defined generally, not just for
autoconf builds, else the wince targets (at least) will complain.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 15:08:33 +00:00
Robert Roebling
c932709d31 Make radiobutton tab behaviour the same on MSW
as in standard MSW app, i.e. tab into the
    activated, not necessarily the first radio
    button.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 14:51:31 +00:00
Włodzimierz Skiba
d775fa8235 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 14:38:52 +00:00
Włodzimierz Skiba
0837533260 Smartphone fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 11:56:48 +00:00
Włodzimierz Skiba
15d83f726c Missed labels to replace number of 'topicNNN' in anchors. Consistent use of -dtor/-ctor addition in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 10:59:57 +00:00
Chris Elliott
9f41fa227b script for nightly builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 10:02:08 +00:00
Jouk Jansen
ce07cd8a75 Committing in .
Changes to make compilations on OpenVMS work:
    displayx11.h : one semicolon removed, since it is not needed
    progdlgg.cpp : On some systems (like OpenVMS) unsigned types are realy
                   unsigned. So a comparison unsigned_var < 0 is always
                   false and causes unreacheable code, which is flagged
                   by the compiler. In this case a change from unsigned long
                   to long was more what was intended here.
 Modified Files:
 	wxWidgets/include/wx/unix/displayx11.h
 	wxWidgets/src/generic/progdlgg.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:29:21 +00:00
Włodzimierz Skiba
2ae23cc5ce Correct #if markup to spin-based controls handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:22:34 +00:00
Włodzimierz Skiba
d1d276f231 WXUNUSED_UNLESS_ODRAWN does not reflect wxUSE_MENUS_NATIVE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:20:42 +00:00
Włodzimierz Skiba
fa3b88eb66 Warning fix to unused variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:18:05 +00:00
Włodzimierz Skiba
0d1f53ca16 Adjustement to the small display of Smartphones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:17:07 +00:00
Włodzimierz Skiba
541cbfa0f4 wxrc impossible on WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 06:10:49 +00:00
Ron Lee
5636172bce Filter out the 'std' pseudo-lib from monolithic builds too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 23:46:54 +00:00
Robin Dunn
49d55bdc6b Bump subrelease to 2.5.2.9.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 22:30:09 +00:00
Ron Lee
fdec35499d Add xrc to the dist target.
Bump subrelease to 2.5.2.9.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 21:54:57 +00:00
Vadim Zeitlin
9a2982a102 update from Petri Jooste for 2.5.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 21:21:50 +00:00
Włodzimierz Skiba
701a0b4766 Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 18:15:59 +00:00
Ron Lee
62b3a2467f Fix registered location of docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:58:23 +00:00
Ron Lee
ceec2216bd wx-config2.6
Designed to be resiliant against future cut and paste coders.  Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble.  In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs.  Functions now all have api
descriptions.  If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.

Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer.  Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future.  In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied.  If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested.  At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.

Removed references to --gl-libs in --help.  It still exists, but if
its deprecated, no need to fill space in a compact help summary.  It
will remain documented (as deprecated) in the man page.

Removed references to arcane order rules for arguments.  Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.

Removed references to --inplace, it doesn't need to be in the summary
help either.  It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly.  When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case).  If you do type it when you don't need it, bad things will
probably happen just like they always would have.

Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging.  If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.

Command line input is now controlled by a small generic parser.  You
define what options you want and what groups you want them in by
initialising them as lists.  It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.

Added a validator for it to check yes/no options.

Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.

Made --list more user friendly.  It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix.  Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called.  We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.

Delegation.  Too big a topic to remark on in depth here, see the code
for a fuller description.  With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified.  This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.

Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.

Added the inplace-config tweak for use in the build tree.  This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed.  It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with.  In that event, it will try to delegate as per the
normal rules.

The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs.  It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)

Enabled full support for static builds again, promoted --static to a
full feature option.  Fixed --ld to return something for them too.

Added --flavour, similar to the existing --vendor, but for autoconf
builds.  These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.

Fix bit rot in make-dist due to new/deleted files.

Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution.  Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about.  Remove extra files and symlinks added for the two
part wx-config version.

Removed the debian -contrib packages.  We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required.  This means the retained contribs will
now get __WXDEBUG__ versions packaged too.

Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.

Added support for flavoured debs as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
Włodzimierz Skiba
6d06e061dc Missed labels to replace number of 'topicNNN' in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 13:24:41 +00:00
Chris Elliott
e5894d192c fix for gtk/mdi when changing menubars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 11:34:38 +00:00
Włodzimierz Skiba
79813ccaf8 XRC movement influenced depth of paths.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 10:18:38 +00:00
Włodzimierz Skiba
a62d884927 XRC library usage fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 10:11:43 +00:00
Włodzimierz Skiba
13bfd81cff Smartphone fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 09:08:52 +00:00
Włodzimierz Skiba
276c8cfb53 WinCE warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 09:03:26 +00:00
Václav Slavík
9a8f051375 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 19:30:20 +00:00
Václav Slavík
a32f9aaf5f moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 19:15:54 +00:00
Václav Slavík
3849327bce moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 18:41:19 +00:00
Włodzimierz Skiba
7e548f6b13 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 11:31:49 +00:00
Włodzimierz Skiba
a203f6c099 Missed labels to replace number of 'topicNNN' in anchors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 11:21:04 +00:00
Vadim Zeitlin
32d49041eb added unit tests for wxStringStreams
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 22:00:16 +00:00
Vadim Zeitlin
a08f2b59fe fixed include header name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 21:59:35 +00:00
Vadim Zeitlin
a5ea75bc6a added wxStringOutputStream::TellO(); fixed bugs in OnSysWrite()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 21:58:50 +00:00
Vadim Zeitlin
5a4c7f718a fixed bug with seeking beyond the end in wxStringInputStream::OnSysSeek() triggered by unit test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 21:49:41 +00:00
Vadim Zeitlin
ba670bae4e made wxStringInputStream::GetSize() public instead of protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 21:35:26 +00:00
Vadim Zeitlin
121fa06ab6 added wxStringStream classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 21:26:45 +00:00
Julian Smart
95561814d9 Correction for GTK+1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 17:20:50 +00:00
Julian Smart
d0247623a6 GDK_WINDOW_TYPE_HINT_SPLASHSCREEN not available in GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 16:08:05 +00:00
Vadim Zeitlin
684dface9a compilation fix for Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 13:17:02 +00:00
Vadim Zeitlin
ef335a4fa8 rebaked to include latest modifications (mainly choicebkg addition)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 12:05:11 +00:00
Stefan Neis
52df30cf2d Applied patch #1023777 (Notebook initialisation).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 12:03:52 +00:00
Vadim Zeitlin
b1f0abe45e don't crash under GTK1 if we failed to get GdkFont in GetTextExtent()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 10:55:51 +00:00
Vadim Zeitlin
a6c255cbc0 added missing header to fix !USE_PCH compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 10:08:24 +00:00
Robin Dunn
9694b21a4d Added wx.Choicebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 23:51:14 +00:00
Robin Dunn
7e6581d421 MemoryFSHandler_AddFile updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 23:13:21 +00:00
Robin Dunn
debff7aa47 Getthe GIL before raisign an exception
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 23:12:24 +00:00
Robin Dunn
3077d12305 Added bin selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 23:11:47 +00:00
Robin Dunn
b728771971 docstring tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 23:11:02 +00:00
Vadim Zeitlin
1892d641c6 mention that Check() doesn't work before the item is attached to a menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 21:54:00 +00:00
Robin Dunn
ef5eca7acc Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 20:14:56 +00:00
Vadim Zeitlin
9a6bc6560b keep m_value in sync with real combobox value (set it initially and update it correctly in CBN_EDITCHANGE handler)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 19:51:39 +00:00
Robin Dunn
162662e91c Use line.Draw(dc) instead of line.GetEventHandler().Draw(dc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 17:33:07 +00:00
Robin Dunn
ae601e32a8 Point x,y fixes from Pierre
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 17:21:57 +00:00
Vadim Zeitlin
ccbc8038e6 added wxSizerItem::Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:29:15 +00:00
Vadim Zeitlin
e245458872 active mode support for wxFTP (extremely heavily modified patch 1006252)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:24:49 +00:00
Vadim Zeitlin
6adbb0bf6e oops, compilation fix after moving code around
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:23:13 +00:00
Vadim Zeitlin
db7c5931ed use 4K buffer instead of reading characters one by one in ReadLine()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:21:56 +00:00
Chris Elliott
1a838ff58b fix compile break for unknown FLASHWINFO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:16:37 +00:00
Václav Slavík
f5de33e90f moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 13:21:57 +00:00
Václav Slavík
7021360ad7 fixed corrupted file, checked in as text file now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 13:03:32 +00:00
Vadim Zeitlin
0a7fd06a09 removed unneeded (after patch 1027243) disable.bmp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 12:36:59 +00:00
Vadim Zeitlin
d50dbf7c6a construct brush used for painting disabled bitmap buttons dynamically (heavily modified patch 1027243)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 12:34:45 +00:00
Vadim Zeitlin
8b573fb839 fixed crash when closing window that contains STC (patch 1017268)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 12:09:12 +00:00
Vadim Zeitlin
6d20f7ae50 fixed signature of wxTimerProc to be conformant to what Windows expects it to be
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 11:54:21 +00:00
Vadim Zeitlin
b521a84a30 moved GTK headers needed by wxUniv to GTK_LOWLEVEL_HDR from GTK_HDR (should fix 1016249)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 11:34:52 +00:00
Vadim Zeitlin
6e2fef031b fixed SetWindowStyleFlag() to not remove WS_VISIBLE; also refresh the control automatically (closes bug 1019440)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 11:03:24 +00:00
Vadim Zeitlin
494ab5def0 added test for toggling wxLC_[HV]RULES styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 11:01:00 +00:00
Vadim Zeitlin
c9cb79cbd6 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 09:59:01 +00:00
Vadim Zeitlin
71c749e1d2 added GetMenu() (closes bug 1026662)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 09:53:20 +00:00
Vadim Zeitlin
f03e9ae7a7 replaced wxLogLastError with an assert when checking an item not attached to a menu (see bug 1030141)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 09:46:02 +00:00
Vadim Zeitlin
55069f24fa compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 09:27:11 +00:00
Václav Slavík
a1e4ec8731 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 08:53:16 +00:00
Václav Slavík
a6c23e02f5 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 08:19:33 +00:00
Włodzimierz Skiba
4e32eea148 Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxID_ANY/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 22:23:59 +00:00
Vadim Zeitlin
600902562d added possibility to specify printer bin (patch 910272)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 22:20:10 +00:00
Vadim Zeitlin
d79c8ea96f do not call CopyIcon() in CloneRefData(), HICON is going to be overwritten or invalidated anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 22:09:23 +00:00
Vadim Zeitlin
e5544e77ec rewrote some sizer code using wxSizerFlags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 21:44:00 +00:00
Vadim Zeitlin
5f813ad662 added wxSizerFlags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 21:42:38 +00:00
Vadim Zeitlin
f938a756a1 compilation fix for wxUSE_THREADS == 0 && __WXDEBUG__ (replaces patch 1025268)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 19:26:32 +00:00
Vadim Zeitlin
1a83b9bd10 fixed rounding errors in variable status bar panes widths computation (patch 1030021)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 19:12:41 +00:00
Włodzimierz Skiba
566a06e8a5 Notebook sample redesign. Now it is 'wxNotebook & friends' and presents wxChoicebook and wxListbook without need of recompilation. User interface moved from buttons to menus in order to work with limited devices (lack of button control in Smartphones). Added presentation of default orientation in controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 18:20:08 +00:00
Włodzimierz Skiba
f644b28c11 Source cleaning: whitespaces, -1/wxID_ANY/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 17:57:44 +00:00
Włodzimierz Skiba
9133965ef5 Notebook sample redesign. Now it is 'wxNotebook & friends' and presents wxChoicebook and wxListbook without need of recompilation. User interface moved from buttons to menus in order to work with limited devices (lack of button control in Smartphones). Added presentation of default orientation in controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 17:39:53 +00:00
Włodzimierz Skiba
bb08a4a194 wxChoicebook follows wxListBook internal changes. Styles centralized for all wxBookCtrls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 17:24:34 +00:00
Robin Dunn
5dd0f8257c Correct indentation and Snap calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 15:29:43 +00:00
Robin Dunn
558d682c9e Append --> append
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 15:27:38 +00:00
Vadim Zeitlin
8e32ea1c8d made all Add/Insert/Prepend methods inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 15:06:53 +00:00
Vadim Zeitlin
436ae7cf35 forward all wxSizer::Add/Prepend/Insert() to a virtual Insert(wxSizerItem) function, all the others made non virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 13:25:20 +00:00
Vadim Zeitlin
4dddb8a2dd fixed gcc warnings about not calling base class ctor explicitly in copy ctors (patch 1028986)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:36:12 +00:00
Vadim Zeitlin
e1ff932979 fix for crash on 64 bit platforms (patch 1028942)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:34:09 +00:00
Vadim Zeitlin
d6e6a35c80 use wxFputs(), not fputs(), in Unicode mode under Unix too (modified patch 1017940)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:31:18 +00:00
Vadim Zeitlin
8318935126 don't force __WXMOTIF__ definition under HP-UX (patch 1017801)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:27:09 +00:00
Vadim Zeitlin
17376dc37e make the label window visible (patch 1013447)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:25:02 +00:00
Vadim Zeitlin
33ebfc3b9b made wxListbook events more consistent with wxNotebook ones (patch 1001271)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:14:34 +00:00
Vadim Zeitlin
627b2b2a0d fix for wxJoystick when not calling SetCapture() (patch 1000685)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:10:34 +00:00
Vadim Zeitlin
837adaa922 don't assert if Update(m_maximum) is called twice (replaces patch 995186)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:06:55 +00:00
Vadim Zeitlin
2c5ef4e2cb smoother time estimation updates in wxProgressDialog (patch 992813)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:04:38 +00:00
Vadim Zeitlin
9b16ffef92 more 'realistic' progress dialog test (part of patch 992813)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 21:57:17 +00:00
Vadim Zeitlin
bceb8d0517 spelling fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 21:23:00 +00:00
Vadim Zeitlin
d4ea57e6e3 mention that read_write mode doesn't work for standalone buffers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 20:51:50 +00:00
Robin Dunn
4d89e13e3a A change similar to that in Bug #837902 to correct minsize calc for
window2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 20:15:17 +00:00
Vadim Zeitlin
93bfd481b7 fixes for harmless mingw32 warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 18:50:48 +00:00
Włodzimierz Skiba
4c8fc4d66c Description of the 'generic dialogs in native builds' application.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 18:35:43 +00:00
Włodzimierz Skiba
7beb59f36c Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 18:13:32 +00:00
Włodzimierz Skiba
7b44c67058 Reverted wxMGL/OpenWatcom fix until some difficoulties will not be solved.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 17:44:29 +00:00
Włodzimierz Skiba
a4d1972da4 Warning fix (unused value assignment).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 16:44:30 +00:00
Włodzimierz Skiba
569ef72a4d Missed labels to replace number of 'topicNNN' with readable filenames in tex2rtf output.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 16:36:40 +00:00
Ron Lee
31aa94e3ae Using != doesn't work for bakefile, I don't know what does, or what this
change really wanted to achieve, but its been broken for a couple of days
now.  Back to you ABX for a real fix.  But please install bakefile if you
are going to tweak these files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 16:02:52 +00:00
Włodzimierz Skiba
8caac90d56 Corrections to frame/tlw references.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 15:42:40 +00:00
Włodzimierz Skiba
92bbdbcdb8 wxChoicebook generic implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 15:13:52 +00:00
Włodzimierz Skiba
f5e0b4bc7c wxChoicebook generic implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 11:29:15 +00:00
Vadim Zeitlin
13bcc34881 fixed sending duplicate EVT_COMBOBOX events; documented that GetValue() returns new value when called from EVT_COMBOBOX handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-15 23:07:15 +00:00
Vadim Zeitlin
35960bbf22 added tests for EVT_ICONIZE/MAXIMIZE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-15 22:36:01 +00:00
Vadim Zeitlin
4bc0f25ed7 fixed wxMaximizeEvent generation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-15 22:14:05 +00:00
Włodzimierz Skiba
b7ecdec5aa ISO C++ cast fix (patches #1024150 and #1024149).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-15 14:00:40 +00:00
Włodzimierz Skiba
5d3e7b52d8 Source cleaning: whitespaces, tabs, FALSE/false, TRUE/true, -1/wxDefaultCoord, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-15 13:20:18 +00:00
Vadim Zeitlin
9eace708fc fixed base classes; also added include file section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 17:33:26 +00:00
Vadim Zeitlin
4d4ff94c65 output "GTK+ 2" toolkit for gtk2 builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 15:33:07 +00:00
Vadim Zeitlin
55c9a18696 allow to use any window, not just wxFrame, as wxLogFrame parent (patch from Paul Gammans)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 15:15:24 +00:00
Włodzimierz Skiba
a62848fdba Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 12:08:28 +00:00
Włodzimierz Skiba
a2668a908a MGL workaround for the build system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 11:41:21 +00:00
George Tasker
acbadd0bc5 Grammtical correction in commented out documentation, but fixed anyway as the comment says portions of the documentation may get moved to other sections of the manual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 11:14:30 +00:00
George Tasker
f292d0ec67 ClearMemberVar() did not correctly handle columns defined as SQL_C_LONG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 11:08:21 +00:00
Robin Dunn
629e65c221 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 06:29:24 +00:00
Robin Dunn
7e63a44037 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 02:58:48 +00:00
Robin Dunn
8dca2f3d86 Some change notes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 02:57:37 +00:00
Robin Dunn
19e14bf6d5 Added SetToWeekOfYear, deprecated SetToTheWeek and GetWeek
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:23:18 +00:00
Robin Dunn
a053624c28 Added wx.WINDOW_DEFAULT_VARIANT constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:21:50 +00:00
Robin Dunn
8f2146748b wx.Sizer.Show can be recursive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:20:47 +00:00
Robin Dunn
702723413e AssociateHandle and DissociateHandle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:20:04 +00:00
Robin Dunn
67f6e901e6 #if fix so we don't end up using the generic header on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:19:23 +00:00
Robin Dunn
50b42eefc4 check that the wxDateTime is valid before converting to datetime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:18:17 +00:00
Robin Dunn
2f9be0b172 whitespace fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 23:17:35 +00:00
Vadim Zeitlin
3fbade2be0 replaced wxControl with wxWindow in 2 methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 20:14:50 +00:00
Robin Dunn
807399558d workaround bug in SWIG's t_output_helper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 18:18:38 +00:00
Włodzimierz Skiba
1a18887b88 Source cleaning: tabs, whitespaces, -1/wxID_ANY, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 18:03:44 +00:00
Włodzimierz Skiba
ba7463d8bb Corrections to wxDirDialog usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 17:53:47 +00:00
Vadim Zeitlin
9ce8d05ed7 fixes after some of wxFrame methods were extracted to wxTLW docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 14:11:01 +00:00
Włodzimierz Skiba
8b2bac626c Recursive wxSizer::Show for subsizer and return value if element was found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 13:46:45 +00:00
Vadim Zeitlin
3778513ac1 no changes, just removed a wrong comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 09:24:35 +00:00
Vadim Zeitlin
14236c1b61 mention wxDateTime::SetToTheWeek() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 09:23:03 +00:00
Vadim Zeitlin
9a32d27d85 added missing conv parameter to wxTextOutputStream ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 09:22:11 +00:00
Vadim Zeitlin
13fc164d3f file with DoMessage() declaration (which I forgot to commit ages ago)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 09:16:39 +00:00
Stefan Csomor
8198ae5017 searching for wxToolBar parent only for kEventMouseMoved events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 04:41:29 +00:00
Vadim Zeitlin
e4940febd0 only define operator<<(wchar_t) in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 15:08:36 +00:00
Stefan Csomor
37a4035b5f added GetMenu Support for MENU_OPEN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 14:24:01 +00:00
Vadim Zeitlin
65a1bb98f5 compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 11:54:41 +00:00
Vadim Zeitlin
0588f8d703 fixed VC6 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 11:52:38 +00:00
Václav Slavík
706b88074d merged libpng-1.2.7 to HEAD (1.2.6 contained serious bug that caused it to produce broken PNG files)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 11:46:04 +00:00
Václav Slavík
880c38ba18 This commit was generated by cvs2svn to compensate for changes in r29107,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 11:40:47 +00:00
Václav Slavík
fe5b7e9b49 Initial revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 11:40:46 +00:00
Stefan Csomor
b16f4bfab2 toolbartool has to send events to parent for tooltips to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-12 09:32:26 +00:00
Vadim Zeitlin
b9e3186d19 typo in last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 22:23:38 +00:00
Vadim Zeitlin
ed4780ea6e added As/DissociateHandle() and implemented it for MSW (modified patch 972356)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 22:17:22 +00:00
Vadim Zeitlin
4c27e2faf3 deprecated SetToTheWeek() and GetWeek(); added and documented new and well-defined SetToWeekOfYear()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 22:07:10 +00:00
Vadim Zeitlin
1c5d27e2ab fixed GetWeekOfYear() for first/last week in some cases (patch 908793)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 21:37:28 +00:00
Vadim Zeitlin
9d769508fb fixed CopyFromBitmap() for shared wxIcon objects by adding CloneRefData() implementation (patch 1026453)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 20:26:44 +00:00
Vadim Zeitlin
0a7b481fee BC++ 5.5 and later supports wxUSE_ON_FATAL_EXCEPTION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 19:21:43 +00:00
Vadim Zeitlin
de20cd5f3b msw/helpchm and helpwin.cpp should be LOWLEVEL; msw/dirdlg.cpp should not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 19:18:46 +00:00
Vadim Zeitlin
51036b441d added a missing delete which resulted in a small memory leak on each wxExecute() (fixes 926802)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 19:10:42 +00:00
Vadim Zeitlin
02272c9c3e default MB -> WC conversion under Win32 now fails if it encounters invalid MB chars; this is more iconv-compatible and fixes wxTextInputStream::NextChar()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 18:47:13 +00:00
Vadim Zeitlin
3ca1bf5add overload operator<<() for wchar_t too (if applicable/possible); this fixes the problem with << '\n' producing '10' on output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 18:42:58 +00:00
Vadim Zeitlin
50531bd2bd define wxWCHAR_T_IS_REAL_TYPE macro: 1 for compilers having real wchar_t native type and 0 for broken ones which define it as a typedef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 18:39:04 +00:00
Stefan Csomor
939a2e8010 NO_DEFAULT support added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 08:25:17 +00:00
Stefan Csomor
ff9f7a12ff support for sys-opted window variant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-11 07:42:44 +00:00
Robin Dunn
ea48a085dc Accomodate either {prefix}/lib or {prefix}/lib64 (the latter is used
on SuSE x86_64 distro)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 21:44:33 +00:00
Robin Dunn
44bf767a1d reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 21:44:08 +00:00
Robin Dunn
1fbf26be16 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 21:42:34 +00:00
Robin Dunn
0320aeddcd ensure that the wxString gets all the wide chars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 21:36:25 +00:00
Robin Dunn
6c3f6fe9b0 another change note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 21:34:52 +00:00
Robin Dunn
5f13b2cac9 Forgot about CalendarEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:54:41 +00:00
Robin Dunn
31b468292c Extended the wx.calendar.CalendarCtrl class with methods that get/set
a Python datetime or date object.  (These will only work with Python
2.3+) The methods are PySetDate, PyGetDate, PySetLowerDateLimit,
PySetUpperDateLimit, PySetDateRange, PyGetLowerDateLimit, and
PyGetUpperDateLimit.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:53:21 +00:00
Vadim Zeitlin
f499e61407 make background colour apply to choice/combobox dropdown listbox as well as the main part (patch 1023669)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:36:50 +00:00
Robin Dunn
1a0f14e16a Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:08:01 +00:00
Robin Dunn
12523ae45c Add depth param to ConvertToBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:06:16 +00:00
Robin Dunn
e572631fe1 Added GetListView accessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:01:02 +00:00
Robin Dunn
241d5f3d34 Fix for ogl.FORMAT_SIZE_TO_CONTENTS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 19:54:05 +00:00
Włodzimierz Skiba
43a6124f65 Some unnecessary wxUSE_MFC occurences removed following Vadim's experience (see wx-dev on 6.8.2004).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 13:24:20 +00:00
Włodzimierz Skiba
68379eaf0a Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoord, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 12:56:07 +00:00
Włodzimierz Skiba
761fbb87fc DMC reality.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 12:09:35 +00:00
Robin Dunn
c370783e91 reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 04:54:41 +00:00
Robin Dunn
60509cc126 fixed case typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 23:14:24 +00:00
Robin Dunn
c32bde282c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 21:02:38 +00:00
Robin Dunn
3eac0818ff undo last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 20:37:36 +00:00
Robin Dunn
0453da6205 default is gtk2 & unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 20:35:00 +00:00
Robin Dunn
4b960c0f84 dependencies for the new swig runtime files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 20:34:17 +00:00
Robin Dunn
6afcb80068 Added RequestUserAttention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 19:16:36 +00:00
Robin Dunn
f86ca7e4f3 Removed my copy of distutils from the wxPython source tree.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 19:07:56 +00:00
Robin Dunn
e51483b128 Added RequestUserAttention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 19:03:20 +00:00
Robin Dunn
da72c54000 New SWIG runtime files and api updates for the move to SWIG 1.3.22
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:59:20 +00:00
Robin Dunn
f2b4a4ea12 Added StockButtons to main demo list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:58:40 +00:00
Robin Dunn
77bfc42310 typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:53:07 +00:00
Robin Dunn
0190c47234 New SWIG runtime files and api updates for the move to SWIG 1.3.22
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:48:25 +00:00
Robin Dunn
414863fd52 New patch for SWIG, updated to SWIG 1.3.22. Removed old patches that
have already been put in to SWIG


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:32:44 +00:00
Robin Dunn
ca63e8e992 For editors and renderers the type registry takes precedence over the
default attr, so we need to register the new editor/renderer for the string
data type in order to make setting a default editor/renderer appear to
work correctly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 18:29:25 +00:00
Włodzimierz Skiba
c9d59ee7e0 Source cleaning: TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 17:42:36 +00:00
Robin Dunn
11908acc89 Removed my copy of distutils from the wxPython source tree.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 17:26:39 +00:00
Vadim Zeitlin
4f79eb791a compilation fix for VC6 (closes 1025093)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 14:34:48 +00:00
Vadim Zeitlin
664df6e951 define WINVER as 0x0400 for VC++ 6 because its headers give a warning if WINVER >= 0x0500 is used and are generally broken for higher WINVER values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 14:33:02 +00:00
Włodzimierz Skiba
13d13a9e19 Correct positioning of the entry text dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 14:14:20 +00:00
Włodzimierz Skiba
068959b9be WinCE fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-09 13:14:28 +00:00
Robin Dunn
d8f9d612be Fixed wrong append() name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 23:50:59 +00:00
Włodzimierz Skiba
4629016dfb Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 17:30:19 +00:00
Vadim Zeitlin
35f4bcaf27 update from Vegh Janos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 13:40:55 +00:00
Vadim Zeitlin
53fcd32e57 unregister GL windows classes on program termination, fixes problem with wx being used in a DLL which is being unloaded and reloaded again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 12:00:12 +00:00
Włodzimierz Skiba
447fd332c8 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 11:18:10 +00:00
Vadim Zeitlin
29e3d1f99b reverted last check in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 10:49:36 +00:00
Vadim Zeitlin
9b59c95b38 added wxTopLevelWindow::RequestUserAttention(); documented it and implemented it for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 09:53:46 +00:00
Włodzimierz Skiba
39fc096d5a Fixes and source cleaning for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 06:41:06 +00:00
Włodzimierz Skiba
c845a1975a Missed include due to wxBookCtrlSizer existence.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 06:26:28 +00:00
Włodzimierz Skiba
302e251b4d Native Smartphone wxTextCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 06:20:42 +00:00
Vadim Zeitlin
dc92adaf0c added wxTopLevelWindow::RequestUserAttention(); documented it and implemented it for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 21:02:55 +00:00
Vadim Zeitlin
5a8e93c455 documented GetIcon(s), extended SetIcons() doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 20:39:35 +00:00
Vadim Zeitlin
834ed99470 extracted common wxDialog/wxFrame methods to tlw.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 20:34:08 +00:00
Vadim Zeitlin
b96f8e9a6f define WINVER as 0x0502 by default (highest possible), not 0x0400; made the comment before it more clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 20:16:51 +00:00
Vadim Zeitlin
33bcca32a9 added accels for submenus; removed weird wxConvCurrent assignment (such code has nothing to do in a sample, especially without any explanation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 19:50:47 +00:00
Vadim Zeitlin
7512bea2cb fixed MSW linking (check for wxUSE_GENERIC_DIALOGS_IN_MSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 19:42:31 +00:00
Włodzimierz Skiba
27d2dbbcca Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!/!IsEmpty(), TRUE/true. FALSE/false, tabs, whitespaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 11:11:05 +00:00
Jouk Jansen
db5cf2b04a Committing in .
Update of an OpenVMS makefile

 Modified Files:
 	wxWidgets/src/common/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 08:34:00 +00:00
Włodzimierz Skiba
bfbb0b4c77 Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, TRUE/true. FALSE/false, tabs, whitespaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-07 06:01:01 +00:00
Ron Lee
6181913e8e Ported forward improvements from the 2.4.2.6 release.
This still won't build new 2.5 packages yet, but it is changes
that will happen anyway so I'm checkpointing the diff here.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-06 04:51:11 +00:00
Václav Slavík
c369d4f116 added all IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-05 19:19:41 +00:00
Ron Lee
631a05be91 GTK Combobox and Listbox aren't realized until actually
visible, so a list_item created before that would
receive a default style instead of the control's style.

Instead of calling ApplyWidgetStyle() which would
iterate all items, only the newly created item will
receive the current style to speed things up.

Thanks to Andreas Pflug.  Closes 984861


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-05 10:08:19 +00:00
Robin Dunn
1f6967c2dd reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 23:47:25 +00:00
Robin Dunn
a8d99e09e7 reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 23:39:30 +00:00
Robin Dunn
d1f3a348ff reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 19:01:22 +00:00
Robin Dunn
01ac03ba5c reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 18:48:31 +00:00
Robin Dunn
abdd2c013f Add DLL export macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 18:45:02 +00:00
Robin Dunn
023a034e0e Add a link to the changes file, move the log file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 18:06:05 +00:00
Robin Dunn
1e14071910 Add the stock item helper fucntions back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 18:03:22 +00:00
Václav Slavík
b3e8529208 wxArtProvider fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 13:23:57 +00:00
Włodzimierz Skiba
f70c044346 Spelling fixes [#1017001]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 02:44:43 +00:00
Włodzimierz Skiba
57f4f9255e Source cleaning: whitespaces, tabs, ::, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 01:53:42 +00:00
Włodzimierz Skiba
a0d9c6cb91 Spelling fixes [#1017001], source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-04 01:26:40 +00:00
Václav Slavík
cb0422ea04 updated version to match latest wxPython release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 21:53:55 +00:00
Václav Slavík
5bfaca1b32 MBCS and IM fixes (patch 1016292)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 21:20:59 +00:00
Robin Dunn
71e60f703c Since it is documented, changed GetOrCreateCellAttr from protected to
public so it can be used from wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 19:30:19 +00:00
Robin Dunn
9a8a6d250f fixed copy/paste error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 19:14:09 +00:00
Robin Dunn
52ef5c3c40 Check for m_peer != NULL in Freeze and Thaw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 19:04:17 +00:00
Robin Dunn
ee8bee6c8c Fixed incorrect clipping region on wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 18:59:14 +00:00
Włodzimierz Skiba
4d08943ee4 Source cleaning: -1/wxID_ANY/wxDefaultCoord, !!/!IsEmpty(), TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 18:32:56 +00:00
Włodzimierz Skiba
77ace0c533 Fix for coordinates in wxEVT_COMMAND_LIST_COL_RIGHT_CLICK [patch #1019696] with test code in the sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 14:35:45 +00:00
Robert Roebling
143318ddbb Applied patch to avoid g_lib wanrings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-03 12:43:28 +00:00
Robin Dunn
5a9b107dd0 Don't set the size until after everything is initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-02 18:35:45 +00:00
Robin Dunn
f72c753686 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-02 00:52:41 +00:00
Robin Dunn
2af70455c5 stockitem.h no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-02 00:46:22 +00:00
Robin Dunn
0f63ec68f6 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-02 00:40:47 +00:00
Robin Dunn
41d1d7e34b another tst style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-02 00:33:59 +00:00
Robin Dunn
dd7cd4a04c more doc fixes and clarifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:52:33 +00:00
Robin Dunn
d19ae79986 really remove them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:40:14 +00:00
Robin Dunn
e998fa2691 Remove wrappers for some functions meant to be interal use only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:39:07 +00:00
Robin Dunn
4f5ff1b284 notes about recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:38:20 +00:00
Robin Dunn
8b6df374df Added demo for Stock Buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:26:51 +00:00
Robin Dunn
b04683b19e If wxGetStockGtkID returns NULL (such as with wx.ID_INDENT on GTK 2.2)
then fall back to normal label setting


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 23:22:47 +00:00
Robin Dunn
7bc1e663f3 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 22:54:00 +00:00
Robin Dunn
611190df3b Some more "wxWindows" --> "wxWidgets"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 22:52:37 +00:00
Robin Dunn
cccce1a6e7 Added wx.lib.ticker.Ticker class from Chris Mellon.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 22:00:21 +00:00
Robin Dunn
b2371711d0 Updated generic window styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:47:01 +00:00
Robin Dunn
a8af432bf0 Added [GS]etBackgroundStyle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:32:11 +00:00
Robin Dunn
1a1ed52682 updates to support stock buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:30:50 +00:00
Robin Dunn
07faea2800 doc updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:29:13 +00:00
Robin Dunn
d9975a314d Add a column for GetUnicodeKey
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:24:42 +00:00
Robin Dunn
167ad3b295 Demo the 3-state checkbox and also right-alignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:23:33 +00:00
Robin Dunn
3d49f2fb17 Added 3-state checkbox and toggle button support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:22:35 +00:00
Robin Dunn
36215a7071 rebaked, for addition of xh_tglbtn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:04:25 +00:00
Robin Dunn
4ac23d05f4 Add 3-state styles, and wxALIGN_RIGHT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 19:02:19 +00:00
Julian Smart
3e2656801d Added wxToggleButton handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 18:24:05 +00:00
Julian Smart
870d9dd57a Added toggle button handler header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 17:47:16 +00:00
Chris Elliott
1d60802908 fix menu switching between children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 13:39:17 +00:00
Chris Elliott
6aca462878 mdi menu updates fixed (after SF 1012653)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-01 09:16:21 +00:00
Vadim Zeitlin
faffacecc4 no real changes, just rewrote ChoiceEditor::EndEdit() in a slightly more concise/clear way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 22:13:56 +00:00
Vadim Zeitlin
01998c0f97 removed apparently useless (and provoking a dummy event) code in ChoiceEditor::EndEdit() resetting the choice to 0 index
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 22:12:06 +00:00
Robin Dunn
733cea9323 Version number bump, with preview flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 19:56:37 +00:00
Robin Dunn
e0465cbdca Don't hide the panel for non-MSW platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 19:54:42 +00:00
Stefan Csomor
7ce1a4e1cd fix for not sending a native click to a control if it is not enabled (does an enable itself)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 18:54:24 +00:00
Robin Dunn
c4c3e30f2e fixed compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 17:26:25 +00:00
Robin Dunn
e6cbc5e169 stockitem.h needs installed too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 17:24:46 +00:00
Robin Dunn
b39a5dc41e Fixes to allow DoGetBestSize to work before CreateGrid has been called.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 16:31:39 +00:00
Robin Dunn
79609e6f24 Adding DrawnShape (patch from Pierre Hjälm)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 14:54:13 +00:00
Włodzimierz Skiba
312ebad4cd some wxUSE_* macros not used consistently (patch #992456) with source cleaning (blind changes).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 13:59:07 +00:00
Włodzimierz Skiba
118322a3df Fix of memory leak with generic file dialog (Patch #1017938)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 12:44:38 +00:00
Włodzimierz Skiba
078cf5cb75 Source cleaning: -1/wxID_ANY/wxNOT_FOUND, ::, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 12:38:46 +00:00
Włodzimierz Skiba
f50ff87bdb Generic dialogs not available in shared nonUniv builds due to their adjustement to SHARED switch of wxWidgets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 11:39:25 +00:00
Julian Smart
85f138db83 Added wxToggleButton handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 07:53:21 +00:00
Václav Slavík
b5ab476a0f load icons from current icon theme under GTK >= 2.4, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 22:31:41 +00:00
Václav Slavík
b08a2401a3 dllexport buffer classes used by wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 21:31:38 +00:00
Václav Slavík
0100b858d6 (partially) fixed splitter sash rendering under GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 16:42:36 +00:00
Václav Slavík
5f7bcb48fd new stock buttons API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 14:42:51 +00:00
Włodzimierz Skiba
598ddd96f4 Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 10:18:55 +00:00
Stefan Csomor
95a8b77a94 correcting a source for double event delivery
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 07:40:19 +00:00
Stefan Csomor
6574f2b143 adapting textctrl position to window theme
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 07:07:26 +00:00
Stefan Csomor
309e4c1464 setting the mac theme font only in VARIANT_NORMAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 06:49:26 +00:00
Stefan Csomor
f5d63a57b1 supporting hidden status bar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 06:46:50 +00:00
Stefan Neis
6944b203c4 Untabified (TABs seem to cause strange problems with autoconf-2.59, at least
on OS/2.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 20:09:09 +00:00
Stefan Csomor
d5ccba7211 fixing retval for SetFont
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 18:52:13 +00:00
Václav Slavík
8da9d91cc4 don't include strings that shouldn't be translated in gettext output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 18:27:51 +00:00
Stefan Csomor
01ffa8f7f7 metal appearance supported under 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 18:25:35 +00:00
Stefan Csomor
f80ffb32eb fixing repositioning problem for statusbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 15:53:14 +00:00
Václav Slavík
30708139fe removed wx-specific fix, it's already fixed in upstream sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 14:30:49 +00:00
Julian Smart
de434621d8 Don't draw flat box unless background style is system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 13:55:13 +00:00
Julian Smart
c7382f913c SetBackgroundStyle(wxBG_STYLE_CUSTOM) can now be used to optimize
background erase on wxGTK (no-op on other platforms)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 13:32:45 +00:00
Václav Slavík
824fd93d76 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 11:02:16 +00:00
Václav Slavík
6d003204e0 re-merged wx fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:59:20 +00:00
Julian Smart
50c538600e First step in background erase optimization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:22:34 +00:00
Václav Slavík
50a8b42c51 merged libpng-1.2.6 to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:21:24 +00:00
Václav Slavík
5b02c8a11f merged libpng-1.2.6 to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:15:26 +00:00
Stefan Csomor
3b656728dd repositioning of mac textctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:07:39 +00:00
Stefan Csomor
7ebf5540cc focus and border refreshes etc corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 10:04:36 +00:00
Václav Slavík
3d11a79a94 This commit was generated by cvs2svn to compensate for changes in r28944,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 09:34:35 +00:00
Václav Slavík
e7fc0c29c9 Initial revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 09:34:33 +00:00
Václav Slavík
e7baa6764f fix for CAN-2004-0797 zlib-1.2.x vulnerability (patch #1018094)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 09:16:03 +00:00
Mattia Barbon
6707bb9406 Patch #1003174: Fixes crash when toolbar has a disabled control
from Ian Brown.

  If you put a control (e.g. a wxChoice) on a toolbar and then
later disable that control, you will get a crash. This is because
the toolbar code always calls disable on the button widget for a
toolbartool. When the tool is a control, there is no button, and
you should call disable on the control instead.
This small patch implements this logic.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-28 19:10:31 +00:00
Stefan Csomor
b3370ae5d8 correcting unicode data conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-28 08:45:42 +00:00
Robin Dunn
b94aea9304 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:13:27 +00:00
Robin Dunn
644dcd57d6 more test tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:12:24 +00:00
Robin Dunn
79db094505 remove preview indicator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:12:03 +00:00
Robin Dunn
df1a2934e9 regenerated ReST docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:11:31 +00:00
Robin Dunn
9c61851294 note another bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:10:57 +00:00
Robin Dunn
ba17a5d761 Add new file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 23:10:15 +00:00
Włodzimierz Skiba
59af881e44 Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-27 18:59:37 +00:00
Robin Dunn
6d30807295 Make wxGrid play nicer with sizers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 18:11:42 +00:00
Robin Dunn
1a57da10c0 Added wxGrid test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 17:16:10 +00:00
Robin Dunn
6f845b2215 Only initialize wxWidgets once
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 17:07:46 +00:00
Włodzimierz Skiba
f13880a907 Polish translation to i18n sample + source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 11:02:13 +00:00
Włodzimierz Skiba
692b3335bc Polish translation to i18n sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 10:58:39 +00:00
Włodzimierz Skiba
213ceb3f0e Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 08:46:18 +00:00
9486 changed files with 55 additions and 3990324 deletions

View File

@@ -1,78 +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
*.vcp
*.vcw
Release
Debug
ReleaseUnicode
DebugUnicode
ReleaseUnicodeARM
DebugUnicodeARM
ReleaseUnicodeMIPS
DebugUnicodeMIPS
ReleaseUnicodeSH3
DebugUnicodeSH3
ReleaseUnicodeX86
DebugUnicodeX86
ReleaseUnicodeX86EM
DebugUnicodeX86EM
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
DebugUnicodeDLL
UnivRelease
UnivDebug
BaseRelease
BaseDebug
BaseReleaseDLL
BaseDebugDLL
build-debug
robert
stamp-h.in
Makefile
setup.h
stamp-h
libtool
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
autom4te.cache

View File

@@ -1,262 +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 (commonly named VCVARS32.BAT)
that needs to be run to set correct environment variables 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://www.cygwin.com/
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:\wxWindows:
-> Copy c:\wxWindows\include\wx\msw\setup0.h
to c:\wxWindows\include\wx\msw\setup.h
-> Edit c:\wxWindows\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:\wxWindows\build\msw
-> 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 c:\wxWindows\build\msw
-> 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
----------------------------------------
No notes.
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.

21124
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,615 +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)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
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
])
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
])
dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
AC_DEFUN([AC_CXX_STATIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
ac_cv_cxx_static_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0; };
class Derived : public Base { public : Derived () {} virtual void f () {} };
int g (Derived&) { return 0; }],[
Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_static_cast" = yes; then
AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
fi
])

2626
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,75 +0,0 @@
/* XPM */
static char * deffile_xpm[] = {
"16 16 56 1",
" c None",
". c #C6C6D5",
"+ c #9494AD",
"@ c #FBFBFC",
"# c #F8F8FA",
"$ c #F4F4F7",
"% c #EEEEF2",
"& c #EAEAF0",
"* c #DEDEE7",
"= c #E0E0E9",
"- c #F5F5F8",
"; c #F0F0F4",
"> c #EDEDF2",
", c #E1E1E9",
"' c #B8B8C4",
") c #A6A6BB",
"! c #E4E4EB",
"~ c #8E8EA2",
"{ c #AFAFC2",
"] c #F7F7F9",
"^ c #F1F1F5",
"/ c #E6E6ED",
"( c #DBDBE5",
"_ c #C0C0CC",
": c #F2F2F6",
"< c #E7E7EE",
"[ c #E3E3EA",
"} c #D0D0DC",
"| c #9898A0",
"1 c #E7E7ED",
"2 c #FAFAFB",
"3 c #F3F3F6",
"4 c #E8E8EE",
"5 c #CBCBD9",
"6 c #B3B3BD",
"7 c #D6D6E1",
"8 c #F9F9FA",
"9 c #DCDCE5",
"0 c #D2D2DE",
"a c #95959C",
"b c #EAEAEF",
"c c #EBEBF1",
"d c #DADAE4",
"e c #B0B0B3",
"f c #E5E5EC",
"g c #DFDFE8",
"h c #DDDDE6",
"i c #B0B0B8",
"j c #E9E9EF",
"k c #868688",
"l c #FFFFFF",
"m c #EFEFF3",
"n c #BBBBC0",
"o c #85858A",
"p c #BEBEC0",
"q c #D7D7E2",
" ........+ ",
" .@#$%&*=.+ ",
" .@#-;>,=.') ",
" .@#-;%!=+~{+ ",
" .@]-^%/=(_.+ ",
" .@]-:;<[}|1+ ",
" .2]-3;4=567+ ",
" .8$:%&970ab+ ",
" .-:^c[(d7e]+ ",
" .-$%f[ghdi!+ ",
" .]^j/!=g(kl+ ",
" .]m4/!=g9nj+ ",
" .$&4/f[g9o$+ ",
" .34<f!,g(p@+ ",
" .;44/!=g9dq+ ",
" ++++++++++++ "};

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,150 +0,0 @@
/* XPM */
static char * exefile_xpm[] = {
"16 16 131 2",
" c None",
". c #D0D0DF",
"+ c #9C9CB6",
"@ c #FFFFFF",
"# c #F9F9FE",
"$ c #F5F5FC",
"% c #E9E9F2",
"& c #EBEBF4",
"* c #5BB5F6",
"= c #AAC6E6",
"- c #D3E9FB",
"; c #D2E8FB",
"> c #FCFCFF",
", c #F8F8FE",
"' c #ECECF4",
") c #D3D3E1",
"! c #60BBF8",
"~ c #11D8FD",
"{ c #24C9F9",
"] c #31BBF5",
"^ c #24BFF6",
"/ c #B9D8F7",
"( c #EFEFF6",
"_ c #1DC9FD",
": c #16CFFC",
"< c #0DB1F1",
"[ c #237EDC",
"} c #2C75D7",
"| c #2A93E5",
"1 c #349EEC",
"2 c #2C9EEC",
"3 c #B0CDF4",
"4 c #F1F1F8",
"5 c #E6E6F0",
"6 c #D7D7E5",
"7 c #C9C9DA",
"8 c #26A4FA",
"9 c #04C3FA",
"0 c #2E7FDB",
"a c #5B9BDA",
"b c #4E9ADE",
"c c #368EDA",
"d c #3D96E2",
"e c #3BA7F0",
"f c #7EAEEC",
"g c #F2F2F9",
"h c #EEEEF5",
"i c #DADAE7",
"j c #CECEDD",
"k c #CCCCDB",
"l c #37B8F8",
"m c #10BEFD",
"n c #0AB0F6",
"o c #C3E5F7",
"p c #51BAEB",
"q c #4EB6EF",
"r c #28A4F1",
"s c #62A3E9",
"t c #D5D5E4",
"u c #D2D2E0",
"v c #2AA5F9",
"w c #00ACFF",
"x c #03B4FD",
"y c #3189E5",
"z c #C8F2FD",
"A c #55DBFB",
"B c #32BDFD",
"C c #0E96EE",
"D c #B0C1E7",
"E c #DCDCE9",
"F c #DBDBE8",
"G c #D8D8E6",
"H c #3A9AF3",
"I c #1F8AF7",
"J c #00A6FF",
"K c #18A1F6",
"L c #94B9E4",
"M c #FEFEFF",
"N c #FDFDFF",
"O c #6FE4FF",
"P c #2FBAFF",
"Q c #2579DF",
"R c #D8DDED",
"S c #E0E0EC",
"T c #DEDEEB",
"U c #4396EA",
"V c #08A0FC",
"W c #00A2FF",
"X c #18A2FA",
"Y c #61B7F6",
"Z c #B0DEFC",
"` c #B0E0FD",
" . c #5AC3FE",
".. c #07A5FF",
"+. c #0399FA",
"@. c #7EA0E1",
"#. c #E5E5EF",
"$. c #E1E1ED",
"%. c #2F9BEE",
"&. c #00A0FF",
"*. c #00A5FF",
"=. c #00A3FF",
"-. c #0098FF",
";. c #009FFF",
">. c #078FEE",
",. c #8BA8E4",
"'. c #E4E4EE",
"). c #3A8AE5",
"!. c #1AA8F0",
"~. c #2A89E5",
"{. c #0EB5F5",
"]. c #0095FF",
"^. c #00B9FF",
"/. c #087AEB",
"(. c #5583DB",
"_. c #EAEAF3",
":. c #E7E7F0",
"<. c #4782DC",
"[. c #00ADFF",
"}. c #0C83ED",
"|. c #2C99E6",
"1. c #01CAFC",
"2. c #1779E3",
"3. c #C4D0EE",
"4. c #598ADA",
"5. c #0EA2EA",
"6. c #6A9FE5",
"7. c #C8D5F1",
"8. c #568CDF",
"9. c #C4D1EE",
"0. c #F3F3F9",
" . . . . . . . . + ",
" . @ @ @ # $ % & . + ",
" * = - ; @ > , ' & . ) + ",
" ! * ~ { ] ^ / > # ( & + + + + ",
" _ : < [ } | 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 Q R S T E + ",
" U V W X Y Z ` ...+.@.#.$.S + ",
" %.&.*.=.-.-.-.-.;.>.,.5 '.S + ",
" ).!.~.{.].].^.=./.(._.:.#.$.+ ",
" <.[.}.|.1.2.3._.:.#.$.+ ",
" 4.5.6.7.8.9.' _.5 #.$.+ ",
" . > 0.0.4 ( & _.:.#.$.+ ",
" + + + + + + + + + + + + "};

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. ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" ...XXXXXXXXXX... ",
" .XXXXXXXXXX. ",
" .XXX...XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" ..... ...... ",
" ",
" ",
" "};

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,18 +0,0 @@
/* XPM */
static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
". c Gray0",
" c None",
/* 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.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -1,2 +0,0 @@
.bakefile_gen.state
Bakefiles.local.bkgen

View File

@@ -1,258 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<bakefile-gen>
<!--
Formats listed here are not generated by default. To enable them, either
remove them from the <disable-formats> directive below or create
Bakefiles.local.bkgen file in this directory and add <enable-formats>
into it:
<?xml version="1.0" ?>
<bakefile-gen>
<enable-formats>dmars</enable-formats>
</bakefile-gen>
Reasons why these formats are disabled (and so not in CVS):
dmars - In beta testing, will be added when it stabilizes.
dmars_smake - ditto
msevc4prj - ditto
cbuilderx - Generated projects are too bad to be included in CVS. Please
*do not* enable this format until FIXMEs in .bkl files related
to cbuilderx are addressed. In particular, the project must
be placed into build/msw(?) directory and store object files
in its subdirectory and it must copy setup.h as others do.
cbx_unix - Doesn't integrate well and won't be used by most Unix people.
-->
<disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
<input>
wx.bkl
../../contrib/build/*/*.bkl
../../samples/*.bkl
../../samples/*/*.bkl
../../samples/*/*/*.bkl
../../demos/*.bkl
../../demos/*/*.bkl
../../demos/*/*/*.bkl
../../utils/*.bkl
../../utils/*/*.bkl
../../utils/*/*/*.bkl
../../contrib/samples/*.bkl
../../contrib/samples/*/*.bkl
../../contrib/samples/*/*/*.bkl
../../contrib/utils/*/*.bkl
../../tests/*.bkl
</input>
<!-- List of output formats to generate: -->
<add-formats>
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
</add-formats>
<del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../demos/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/mobile/mobile_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../utils/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<!-- WinCE can't have console apps: -->
<del-formats files="../../samples/console/*">msevc4prj</del-formats>
<del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
<del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../tests/*">msevc4prj</del-formats>
<!-- Default flags (for all formats and bakefiles): -->
<add-flags>-Iformats</add-flags>
<!-- Directories where the files go: -->
<add-flags files="wx.bkl" formats="autoconf">
-o../../Makefile.in
</add-flags>
<add-flags files="wx.bkl" formats="borland">
-o../msw/makefile.bcc
</add-flags>
<add-flags files="wx.bkl" formats="dmars_smake">
-o../msw/makefile.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-o../msw/makefile.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-o../msw/makefile.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-o../msw/makefile.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-o../msw/makefile.wat
</add-flags>
<add-flags files="wx.bkl" formats="msvc6prj">
-o../msw/wx.dsw
</add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>
<add-flags files="wx.bkl" formats="cbuilderx">
-o../../wx.cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
</add-flags>
<!-- FIXME: don't do this once it is possible (new CBX version) -->
<add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl"
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
</add-flags>
<!-- Format specific settings: -->
<add-flags formats="autoconf">
-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
</add-flags>
<add-formats files="wx.bkl">wx24dsp</add-formats>
<add-flags formats="wx24dsp">
-DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
</add-flags>
<add-formats files="wx.bkl">rpmspec</add-formats>
<!-- Makefile specific settings: -->
<add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
-DWRITE_OPTIONS_FILE=0
</add-flags>
<del-flags files="wx.bkl">
-DWRITE_OPTIONS_FILE=0
</del-flags>
<add-flags files="wx.bkl" formats="borland">
-DOPTIONS_FILE=config.bcc
</add-flags>
<add-flags files="wx.bkl" formats="dmars_smake">
-DOPTIONS_FILE=config.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-DOPTIONS_FILE=config.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-DOPTIONS_FILE=config.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-DOPTIONS_FILE=config.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-DOPTIONS_FILE=config.wat
</add-flags>
<add-flags files="../../*/*">-DWXTOPDIR=../</add-flags>
<add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
<add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
<add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
<add-flags files="../../*/*" formats="borland">
-DOPTIONS_FILE=../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*" formats="dmars_smake">
-DOPTIONS_FILE=../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*" formats="dmars">
-DOPTIONS_FILE=../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*" formats="mingw">
-DOPTIONS_FILE=../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*" formats="msvc">
-DOPTIONS_FILE=../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*" formats="watcom">
-DOPTIONS_FILE=../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*" formats="borland">
-DOPTIONS_FILE=../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*" formats="dmars">
-DOPTIONS_FILE=../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*" formats="mingw">
-DOPTIONS_FILE=../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*" formats="msvc">
-DOPTIONS_FILE=../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*" formats="watcom">
-DOPTIONS_FILE=../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../../build/msw/config.wat
</add-flags>
<!-- Personal customizations (not in CVS): -->
<include file="Bakefiles.local.bkgen" ignore_missing="1"/>
</bakefile-gen>

View File

@@ -1,43 +0,0 @@
This directory contains Bakefile (see http://bakefile.sourceforge.net)
files needed to generate native makefiles for wxWidgets library, contrib and
samples.
Use the bakefile_gen utility to regenerate the makefiles (run it in this
directory!). If you run it with no arguments, it will generate all makefiles
that are not up to date.
Use "bakefile_gen -c" to clean generated files.
You can generate or clean only subset of files by specifying -f or -b flags
when invoking bakefile_gen. For example, "bakefile_gen -fborland,watcom" will
only regenerate Borland C++ and OpenWatcom makefiles. -b flag limits
regeneration only to specified bakefiles. For example,
"bakefile_gen -b wx.bkl" will only regenerate main library makefiles.
"bakefile_gen -b "../../samples/html/*/*.bkl" will regenerate makefiles for
all wxHTML samples. -b and -f can be combined.
You can customize the process of generating makefiles by adding file
Bakefiles.local.bkgen (same format as Bakefiles.bkgen) with further settings.
For example, you may disable output for compilers you don't use:
<?xml version="1.0" ?>
<bakefile-gen>
<disable-formats>msvc,msvc6prj</disable-formats>
</bakefile-gen>
Note: bakefile_gen creates file .bakefile_gen.state with dependencies
information. This file can be safely deleted, but it contains valuable
information that speed up regeneration process.
Note: the following files are generated using bakefile_gen:
* build/msw/*
* contrib/build/* (except .bkl files)
* makefiles with same names as makefiles in above dirs, Makefile.in files
that contain "This makefile was generated by Bakefile" banner and
VC++ project files in samples, demos and utils directories (inc. contrib
ones)
* src/wxWindows.dsp
* {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
* autoconf_inc.m4
* all Makefile.in files
(hopefully I didn't forget anything - VS)

View File

@@ -1,54 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Generate build.cfg file on Windows, with settings used to build
the library.
-->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg
</set>
<action id="build_cfg_file">
<is-phony>1</is-phony>
<dependency-of>all</dependency-of>
<depends>libdir_setup</depends>
<command>
@echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=$(WXVER_RELEASE) >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
@echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
@echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
@echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
@echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
@echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
@echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
@echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
@echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
@echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
</command>
</action>
</if>
</makefile>

View File

@@ -1,577 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<requires version="0.1.4"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<!-- load python module with wxwindows helpers: -->
<using module="wxwin"/>
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<!-- ================================================================== -->
<!-- wxWidgets 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">
<!-- WinCE is Unicode-only platform: -->
<if cond="UNICODE=='1' and FORMAT!='msevc4prj'">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' and USE_ODBC=='1'">
$(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: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
</set>
<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">
<if cond="FORMAT!='cbuilderx'">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
</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)$(DIR_SUFFIX_CPU)_lib$(CFG)
</if>
<if cond="FORMAT!='autoconf' and SHARED=='1'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_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="EXCEPTIONSFLAG">
<if cond="USE_EXCEPTIONS=='1'">on</if>
<if cond="USE_EXCEPTIONS=='0'">off</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>
<!-- does not cover all cases, but better than nothing -->
<set var="NO_VC_CRTDBG">
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
<if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
</set>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</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>
<cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
<cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<define>$(NO_VC_CRTDBG)</define>
</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 wxWidgets; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
</template>
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<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=='msevc4prj'">
<msvc-headers>wx/msw/wince/setup.h</msvc-headers>
<set var="vc_setup_h">wince\setup.h</set>
<set var="vc_setup_h_rule">wince_setup_h</set>
</if>
<if cond="FORMAT!='msevc4prj'">
<msvc-headers>wx/msw/setup.h</msvc-headers>
<set var="vc_setup_h">setup.h</set>
<set var="vc_setup_h_rule">setup_h</set>
</if>
<if cond="IS_MSVC_PRJ">
<set var="_custom_build_files" append="1">
include\wx\msw\$(vc_setup_h)
</set>
<set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\$(vc_setup_h)
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
</if>
</define-tag>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
</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 wxWidgets 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>
<!-- this include is added by configure, we need to put other
includes before it: -->
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<warnings>max</warnings>
</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="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="FORMAT=='msevc4prj'">
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>commctrl</sys-lib>
<sys-lib>winsock</sys-lib>
<sys-lib>wininet</sys-lib>
</if>
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<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>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 cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
<sys-lib>odbc32</sys-lib>
</if>
</if>
</template>
<!-- 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' and TOOLKIT=='MSW'">
<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.cpp
src/msw/gsockmsw.cpp
</precomp-headers-exclude>
</if>
<if cond="IS_MSVC_PRJ=='1' 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="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 wxWidgets plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
<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_VERSION0">
<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>
<set var="PLUGVERDELIM">
<if cond="PLATFORM_UNIX=='1'">-</if>
<if cond="PLATFORM_UNIX=='0'"></if>
</set>
<set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
<if cond="UNICODE=='0' and BUILD=='debug'">d</if>
<if cond="UNICODE=='1' and BUILD=='release'">u</if>
<if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
</set>
<set var="PLUGINS_INST_DIR" make_var="1">
$(LIBDIR)/wx/$(PLUGIN_VERSION0)
</set>
<define-rule name="wx-base-plugin" extends="module">
<template>
<dllname>
$(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
$(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWidgets 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>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
<!-- A hack to keep autoconf happy (we pass CPPFLAGS that contain
{top_srcdir} from configure, poor bakefile can't know that
and won't output top_srcdir = @top_srcdir@ line): -->
<set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
</makefile>

View File

@@ -1,38 +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>
<template id="wx_contrib_util" template="wx_util">
<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>
<install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)</install-to>
</template>
</makefile>

View File

@@ -1,126 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWidgets 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>
<!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
<!-- this include is not added via <include> for autoconf, see
common.bkl: -->
<res-include cond="FORMAT=='autoconf'">
$(TOP_SRCDIR)include
</res-include>
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
<if cond="FORMAT=='autoconf'">
<wx-os2-lib-resource/>
</if>
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
<if cond="FORMAT!='autoconf'">
<define>NOPCH</define>
</if>
</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>
<template id="wx_test_console" template="wx_sample_console">
<cppflags>$(CPPUNIT_CFLAGS)</cppflags>
<ldflags>$(CPPUNIT_LIBS)</ldflags>
</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>
<!-- =============================================================== -->
<!-- Misc platform specialities: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<include file="mac_bundles.bkl"/>
<!--
A hack to include precompiled OS/2 resource file in apps instead of
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
compiler):
-->
<define-tag name="wx-os2-lib-resource" rules="exe">
<set var="os2_lib_res">
<if cond="PLATFORM_OS2=='1'">
$(TOP_SRCDIR)include/wx/os2/wx.res
</if>
</set>
<set var="__objects" append="1">$(os2_lib_res)</set>
</define-tag>
</if>
</makefile>

View File

@@ -1,348 +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 wxWidgets?
</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>
<set var="MONOLITHIC_DEFAULT">
<if cond="FORMAT=='watcom'">1</if>
<if cond="FORMAT!='watcom'">0</if>
</set>
<option name="MONOLITHIC">
<values>0,1</values>
<values-description>Multilib,Monolithic</values-description>
<default-value>$(MONOLITHIC_DEFAULT)</default-value>
<description>
Multiple libraries or single huge monolithic one?
</description>
</option>
<if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
<option name="USE_PLUGINS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build parts of the library as dynamically loadable plugins
(only supported in multilib build)?
</description>
</option>
</if>
<if cond="FORMAT!='autoconf'">
<set var="USE_PLUGINS">0</set> <!-- FIXME - temporary -->
</if>
<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="USE_EXCEPTIONS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable exceptions in compiled code.
</description>
</option>
<option name="OFFICIAL_BUILD">
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWidgets 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>
<!-- unit tests support: -->
<option name="CPPUNIT_CFLAGS">
<default-value></default-value>
<description>
Compiler flags needed to compile test suite in tests directory. If you want
to run the tests, set it so that the compiler can find CppUnit headers.
</description>
</option>
<option name="CPPUNIT_LIBS">
<default-value></default-value>
<description>
Linker flags needed to link test suite in tests directory. If you want
to run the tests, include CppUnit library here.
</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_HTML"/>
<option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
<option name="EXTRALIBS_SDL"/>
<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 -->
<option name="WITH_PLUGIN_SDL">
<values>0,1</values>
</option>
</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" overwrite="0">
<if cond="FORMAT!='msevc4prj'">MSW</if>
<if cond="FORMAT=='msevc4prj'">WINCE</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
<set var="WITH_PLUGIN_SDL">0</set>
<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>
<if cond="FORMAT=='cbuilderx'">
<set var="EXTRACFLAGS">
<if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
</set>
</if>
<!-- ================================================================== -->
<!-- Project files - hardcode some defaults -->
<!-- ================================================================== -->
<if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
<set var="RUNTIME_LIBS">dynamic</set>
<set var="OFFICIAL_BUILD">0</set>
<set var="USE_HTML">1</set>
<set var="USE_OPENGL">1</set>
<set var="USE_ODBC">1</set>
<set var="MONOLITHIC">0</set>
<set var="USE_GUI">1</set>
<set var="USE_EXCEPTIONS">1</set>
<set var="DEBUG_INFO">default</set>
<set var="DEBUG_FLAG">default</set>
<set var="MSLU">0</set>
</if>
<!-- FIXME:
C++BuilderX supports only wxMSW, monolithic (sic!) static build
and the project can't be put into build/msw and store objects in
build/msw/something. This *must* be fixed! -->
<if cond="FORMAT=='cbuilderx'">
<set var="WXUNIV">0</set>
<set var="MONOLITHIC">1</set>
<set var="SRCDIR">.</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="SHARED">0</set>
</if>
<!-- DigitalMars make is braindead, it doesn't have conditional
processing: -->
<if cond="FORMAT=='dmars'">
<set var="RUNTIME_LIBS">static</set>
<set var="BUILD">debug</set>
<set var="SHARED">0</set>
<set var="WXUNIV">0</set>
<set var="UNICODE">0</set>
</if>
<!-- No need for wxUniv on embedded devices (yet): -->
<if cond="FORMAT=='msevc4prj'">
<set var="WXUNIV">0</set>
<set var="UNICODE">1</set>
<set var="MONOLITHIC">1</set> <!-- sic! -->
</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-8012 -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,28 +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>
<format id="rpmspec">
<description>
wxBase headers list in wx{GTK,Motif,X11}.spec
</description>
<default-filename>xxx.spec</default-filename>
</format>
<format id="cbx_unix">
<description>
C++BuilderX projects for Unix (use configure)
</description>
<default-filename>
$(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
</default-filename>
</format>
</bakefile-manifest>

View File

@@ -1,6 +0,0 @@
This directory contains misc Bakefile backends that are wxWidgets-specific:
wx24dsp - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
rpmspec - generates part of .spec files with list of wxBase headers
cbx_unix - Borland C++BuilderX project files for configure-based build

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="presets/fake.bkl"/>
<set var="COMPILER">vc</set>
<define-tag name="__fake_hook" rules="__fake">
<set var="type" overwrite="0">fake</set>
</define-tag>
<define-tag name="__fake_hook" rules="exe">
<set var="type">exe</set>
</define-tag>
<output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
<set var="FORMAT_OUTPUT_VARIABLES">type</set>
</makefile>

View File

@@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--C++BuilderX Project-->
<project>
<property category="build.config" name="active" value="0"/>
<property category="build.config" name="count" value="1"/>
<property category="build.config" name="excludedefaultforzero" value="0"/>
<property category="build.config.0" name="builddir" value="Debug"/>
<property category="build.config.0" name="key" value="Debug_Build"/>
<property category="build.config.0" name="name" value="Debug Build"/>
<property category="build.config.0" name="settings.MinGW" value="default;debug"/>
<property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
<property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
<property category="build.config.0" name="settings.mswin32" value="default;debug"/>
<property category="build.config.0" name="type" value="Toolset"/>
<property category="build.config.1" name="key" value="Release_Build"/>
<property category="build.config.1" name="name" value="Release Build"/>
<property category="build.config.1" name="settings.MinGW" value="default;release"/>
<property category="build.config.1" name="settings.gnuc++" value="default;release"/>
<property category="build.config.1" name="settings.intellinia32" value="default;release"/>
<property category="build.config.1" name="settings.mswin32" value="default;release"/>
<property category="build.config.1" name="type" value="Toolset"/>
<property category="build.node" name="type" value="CBMakefileProjectType"/>
<property category="build.platform" name="active" value="linux"/>
<property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
<property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
<property category="build.platform" name="linux.default" value="gnuc++"/>
<property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
<property category="build.platform" name="linux.mswin32.enabled" value="0"/>
<property category="build.platform" name="linux.win32b.enabled" value="0"/>
<property category="build.platform" name="solaris.default" value="gnuc++"/>
<property category="build.platform" name="solaris.enabled" value="0"/>
<property category="build.platform" name="win32.default" value="MinGW"/>
<property category="build.platform" name="win32.enabled" value="0"/>
<property category="cbproject" name="lastnodeid" value="4"/>
<property category="cbproject" name="version" value="X.1.0"/>
<property category="classbrowser" name="enable" value="0"/>
<property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
<property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
<property category="makefileproject" name="makefile.ID.1" value="1"/>
<property category="makefileproject" name="makefile.list.1" value="Makefile"/>
<property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
<property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
<property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
<property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
@{
ALL_EXES = [x for x in targets if x.type=='exe']
if len(ALL_EXES) == 1:
DEFAULT_EXE = 0
else:
DEFAULT_EXE = -1
}@
<property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
@[for i in range(0,len(ALL_EXES))]@
<property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
<property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
<property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
<property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
<property category="runtime.@i" name="native.startdir.path" value="."/>
<property category="runtime.@i" name="native.target.override" value="1"/>
@[end for]@
<property category="unique" name="id" value="4"/>
<node name="console" type="NavigationDirectory">
<property category="directorynode" name="showSubdirectories" value="1"/>
<property category="directorynode" name="url" value="."/>
<property category="unique" name="id" value="1"/>
</node>
</project>

View File

@@ -1,18 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="presets/fake.bkl"/>
<set var="COMPILER">gcc</set>
<set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
<output file="../../wxGTK.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
<output file="../../wxX11.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
<output file="../../wxMotif.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
</makefile>

View File

@@ -1,5 +0,0 @@
# --- wxBase headers list begins here ---
cat <<EOF >wxbase-headers-list
@('\n'.join(ALL_BASE_HEADERS.split()))
EOF
# --- wxBase headers list ends here ---

View File

@@ -1,19 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="win32.bkl"/>
<set var="COMPILER">vc</set>
<include file="presets/fake.bkl"/>
<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,461 +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"
# Begin Source File
SOURCE="This project is deprecated, please see install.txt"
# End Source File
@[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"
@[end if]@
@[if src.endswith('.c')]@
# SUBTRACT CPP /YX /Yc /Yu
@[end if]@
# End Source File
@[end for]@
# End Group
@[end for]@
# 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 for]@
# End Group
@[end for]@
# End Group
# End Target
# End Project

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,85 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Support for application bundles, for wxWidgets 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/carbon/Info.plist.in
</set>
<set var="BUNDLE_RESOURCE">
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc
</set>
<set var="BUNDLE_ICONS">
$(TOP_SRCDIR)src/mac/carbon/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>
<set var="BUNDLE_TGT_REF">
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
</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 wxWidgets resources and icons: -->
cp -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
cp -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_REF)</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,38 +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) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</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) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
</makefile>

View File

@@ -1,195 +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_MULTILIB" 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_MULTILIB" 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_MULTILIB" 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) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
</dll>
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" 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_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" 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>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<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_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" 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_MULTILIB" 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,41 +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>
<depends>basedll</depends>
<depends>coredll</depends>
<!-- link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
</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,16 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================ -->
<!-- Unix audio plugins -->
<!-- ================================================================ -->
<wx-base-plugin id="sound_sdl" cond="WITH_PLUGIN_SDL=='1'">
<sources>$(UNIX_SOUND_SRC_SDL)</sources>
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
</wx-base-plugin>
</makefile>

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- Additional dependencies of core libraries if plugins are
disabled (these would be deps of the plugins if they were
enabled): -->
<set var="PLUGIN_ADV_EXTRALIBS">
<if cond="USE_PLUGINS=='0'">
$(EXTRALIBS_SDL)
</if>
</set>
<!-- monolithic library must link against all this: -->
<set var="PLUGIN_MONOLIB_EXTRALIBS">$(PLUGIN_ADV_EXTRALIBS)</set>
</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,41 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">
<!-- NB: regex lib doesn't compile on WinCE -->
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
</if>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<libname>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<define>__WX$(TOOLKIT)__</define>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
<cflags-dmars>-w12</cflags-dmars>
<sources>
src/regex/regcomp.c
src/regex/regexec.c
src/regex/regerror.c
src/regex/regfree.c
</sources>
</lib>
</makefile>

View File

@@ -1,74 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBTIFF"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBTIFF">
<!-- NB: libtiff doesn't compile on WinCE -->
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</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_OS2=='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>
<include>$(INC_ZLIB)</include>
<include>$(INC_JPEG)</include>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<cflags-dmars>-w2</cflags-dmars>
<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,210 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!-- Master bakefile for wxWidgets -->
<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"/>
<!-- wxWidgets variant where everything is in one library: -->
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
<if cond="FORMAT in ['msvc6prj','msevc4prj']">
<set var="MSVC6PRJ_MERGED_TARGETS">
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
</set>
</if>
<!-- OpenGL canvas is built as separate library in both cases: -->
<include file="opengl.bkl"/>
<!-- Dynamically loadable plugins: -->
<include file="plugins.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 in ['MSW','MGL']">../../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) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
(cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
$(INSTALL_PROGRAM) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) $(DESTDIR)$(BINDIR)
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) wx-config)
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-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>
<install-to>
$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
</install-to>
</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/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/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 DOS/Windows: -->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
<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'">$(TOOLKIT_LOWERCASE)</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 wxWidgets 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 " wxWidgets comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
@echo " Read the wxWidgets 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>
<include file="build_cfg.bkl"/>
</makefile>

View File

@@ -1,153 +0,0 @@
#
# Helper functions for wxWidgets 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):
try:
# this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature:
utils.checkBakefileVersion('0.1.5')
def __noopSubst(name, func, caller):
return '$(%s)' % name
except AttributeError:
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 wxWidgets 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']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',
'xml' : '$(EXTRALIBS_XML)',
'html' : '$(EXTRALIBS_HTML)',
'odbc' : '$(EXTRALIBS_ODBC)',
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
}
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)
def extraLdflags(wxlibname):
if wxlibname in EXTRALIBS:
return EXTRALIBS[wxlibname]
else:
return ''
wxVersion = None
VERSION_FILE = '../../include/wx/version.h'
def getVersion():
"""Returns wxWidgets 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(): prf=' '
if sources[-1].isspace(): suf=' '
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."""
return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)

View File

@@ -1,42 +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-8008 -w-8012 -w-8057 -w-8066
</cflags-borland>
<if cond="FORMAT=='msevc4prj'">
<define>NO_ERRNO_H</define>
</if>
<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/infback.c
src/zlib/inftrees.c
src/zlib/inffast.c
</sources>
</lib>
</makefile>

View File

@@ -1,146 +0,0 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.1.4 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# C compiler
!ifndef CC
CC = bcc32
!endif
# C++ compiler
!ifndef CXX
CXX = bcc32
!endif
# Standard flags for CC
!ifndef CFLAGS
CFLAGS =
!endif
# Standard flags for C++
!ifndef CXXFLAGS
CXXFLAGS =
!endif
# Standard preprocessor flags (common for CC and CXX)
!ifndef CPPFLAGS
CPPFLAGS = -a8 -g0
!endif
# Standard linker flags
!ifndef LDFLAGS
LDFLAGS =
!endif
# What type of library to build? [0,1]
!ifndef SHARED
SHARED = 0
!endif
# Build wxUniversal instead of native port? [0,1]
!ifndef WXUNIV
WXUNIV = 0
!endif
# Compile Unicode build of wxWidgets? [0,1]
!ifndef UNICODE
UNICODE = 0
!endif
# Use MSLU library when building Unicode version. [0,1]
!ifndef MSLU
MSLU = 0
!endif
# Type of compiled binaries [debug,release]
!ifndef BUILD
BUILD = debug
!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
# 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
# Multiple libraries or single huge monolithic one? [0,1]
!ifndef MONOLITHIC
MONOLITHIC = 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 OpenGL canvas library (USE_GUI must be 1)? [0,1]
!ifndef USE_OPENGL
USE_OPENGL = 0
!endif
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
!ifndef USE_ODBC
USE_ODBC = 0
!endif
# Enable exceptions in compiled code. [0,1]
!ifndef USE_EXCEPTIONS
USE_EXCEPTIONS = 1
!endif
# Is this official build by wxWidgets developers? [0,1]
!ifndef OFFICIAL_BUILD
OFFICIAL_BUILD = 0
!endif
# Use this to name your customized DLLs differently
!ifndef VENDOR
VENDOR = custom
!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
# Compiler flags needed to compile test suite in tests directory. If you want
# to run the tests, set it so that the compiler can find CppUnit headers.
!ifndef CPPUNIT_CFLAGS
CPPUNIT_CFLAGS =
!endif
# Linker flags needed to link test suite in tests directory. If you want
# to run the tests, include CppUnit library here.
!ifndef CPPUNIT_LIBS
CPPUNIT_LIBS =
!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

View File

@@ -1,101 +0,0 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.1.4 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# C compiler
CC = gcc
# C++ compiler
CXX = g++
# Standard flags for CC
CFLAGS =
# Standard flags for C++
CXXFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# Standard linker flags
LDFLAGS =
# What type of library to build? [0,1]
SHARED = 0
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0
# Compile Unicode build of wxWidgets? [0,1]
UNICODE = 0
# Use MSLU library when building Unicode version. [0,1]
MSLU = 0
# Type of compiled binaries [debug,release]
BUILD = debug
# 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 __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
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 0
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Enable exceptions in compiled code. [0,1]
USE_EXCEPTIONS = 1
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# 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 =
# Compiler flags needed to compile test suite in tests directory. If you want
# to run the tests, set it so that the compiler can find CppUnit headers.
CPPUNIT_CFLAGS =
# Linker flags needed to link test suite in tests directory. If you want
# to run the tests, include CppUnit library here.
CPPUNIT_LIBS =
# 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
# 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

View File

@@ -1,100 +0,0 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.1.4 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# C compiler
CC = cl
# C++ compiler
CXX = cl
# Standard flags for CC
CFLAGS =
# Standard flags for C++
CXXFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# Standard linker flags
LDFLAGS =
# What type of library to build? [0,1]
SHARED = 0
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0
# Compile Unicode build of wxWidgets? [0,1]
UNICODE = 0
# Use MSLU library when building Unicode version. [0,1]
MSLU = 0
# Type of compiled binaries [debug,release]
BUILD = debug
# 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 __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 link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
# Acts according to DEBUG_INFO by default. [0,1,default]
DEBUG_RUNTIME_LIBS = default
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 0
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Enable exceptions in compiled code. [0,1]
USE_EXCEPTIONS = 1
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# 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 =
# Compiler flags needed to compile test suite in tests directory. If you want
# to run the tests, set it so that the compiler can find CppUnit headers.
CPPUNIT_CFLAGS =
# Linker flags needed to link test suite in tests directory. If you want
# to run the tests, include CppUnit library here.
CPPUNIT_LIBS =
# 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

View File

@@ -1,93 +0,0 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.1.4 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# C compiler
CC = wcc386
# C++ compiler
CXX = wpp386
# Standard flags for CC
CFLAGS =
# Standard flags for C++
CXXFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# Standard linker flags
LDFLAGS =
# What type of library to build? [0,1]
SHARED = 0
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0
# Compile Unicode build of wxWidgets? [0,1]
UNICODE = 0
# Type of compiled binaries [debug,release]
BUILD = debug
# 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 __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
# Multiple libraries or single huge monolithic one? [0,1]
MONOLITHIC = 1
# Build GUI libraries? [0,1]
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
# Enable exceptions in compiled code. [0,1]
USE_EXCEPTIONS = 1
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD = 0
# Use this to name your customized DLLs differently
VENDOR = custom
# 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 =
# Compiler flags needed to compile test suite in tests directory. If you want
# to run the tests, set it so that the compiler can find CppUnit headers.
CPPUNIT_CFLAGS =
# Linker flags needed to link test suite in tests directory. If you want
# to run the tests, include CppUnit library here.
CPPUNIT_LIBS =
# 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

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: "wxregex"=wx_wxregex.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxzlib"=wx_wxzlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxpng"=wx_wxpng.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxjpeg"=wx_wxjpeg.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxtiff"=wx_wxtiff.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxexpat"=wx_wxexpat.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "base"=wx_base.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "net"=wx_net.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "core"=wx_core.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "adv"=wx_adv.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "html"=wx_html.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "xml"=wx_xml.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "gl"=wx_gl.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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "adv - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "adv - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "adv - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "adv - Win32 DLL Universal Unicode Release"
# Name "adv - Win32 DLL Universal Unicode Debug"
# Name "adv - Win32 DLL Universal Release"
# Name "adv - Win32 DLL Universal Debug"
# Name "adv - Win32 DLL Unicode Release"
# Name "adv - Win32 DLL Unicode Debug"
# Name "adv - Win32 DLL Release"
# Name "adv - Win32 DLL Debug"
# Name "adv - Win32 Universal Unicode Release"
# Name "adv - Win32 Universal Unicode Debug"
# Name "adv - Win32 Universal Release"
# Name "adv - Win32 Universal Debug"
# Name "adv - Win32 Unicode Release"
# Name "adv - Win32 Unicode Debug"
# Name "adv - Win32 Release"
# Name "adv - Win32 Debug"
# 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\sound.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\taskbar.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\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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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\sound.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\taskbar.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\sound.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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "dbgrid - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "dbgrid - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "dbgrid - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmswuniv252d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.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\wxmsw252d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "dbgrid - Win32 DLL Universal Unicode Release"
# Name "dbgrid - Win32 DLL Universal Unicode Debug"
# Name "dbgrid - Win32 DLL Universal Release"
# Name "dbgrid - Win32 DLL Universal Debug"
# Name "dbgrid - Win32 DLL Unicode Release"
# Name "dbgrid - Win32 DLL Unicode Debug"
# Name "dbgrid - Win32 DLL Release"
# Name "dbgrid - Win32 DLL Debug"
# Name "dbgrid - Win32 Universal Unicode Release"
# Name "dbgrid - Win32 Universal Unicode Debug"
# Name "dbgrid - Win32 Universal Release"
# Name "dbgrid - Win32 Universal Debug"
# Name "dbgrid - Win32 Unicode Release"
# Name "dbgrid - Win32 Unicode Debug"
# Name "dbgrid - Win32 Release"
# Name "dbgrid - Win32 Debug"
# 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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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,305 +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 odbc
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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gl - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gl - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "gl - Win32 DLL Universal Unicode Release"
# Name "gl - Win32 DLL Universal Unicode Debug"
# Name "gl - Win32 DLL Universal Release"
# Name "gl - Win32 DLL Universal Debug"
# Name "gl - Win32 DLL Unicode Release"
# Name "gl - Win32 DLL Unicode Debug"
# Name "gl - Win32 DLL Release"
# Name "gl - Win32 DLL Debug"
# Name "gl - Win32 Universal Unicode Release"
# Name "gl - Win32 Universal Unicode Debug"
# Name "gl - Win32 Universal Release"
# Name "gl - Win32 Universal Debug"
# Name "gl - Win32 Unicode Release"
# Name "gl - Win32 Unicode Debug"
# Name "gl - Win32 Release"
# Name "gl - Win32 Debug"
# 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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "html - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "html - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "html - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "html - Win32 DLL Universal Unicode Release"
# Name "html - Win32 DLL Universal Unicode Debug"
# Name "html - Win32 DLL Universal Release"
# Name "html - Win32 DLL Universal Debug"
# Name "html - Win32 DLL Unicode Release"
# Name "html - Win32 DLL Unicode Debug"
# Name "html - Win32 DLL Release"
# Name "html - Win32 DLL Debug"
# Name "html - Win32 Universal Unicode Release"
# Name "html - Win32 Universal Unicode Debug"
# Name "html - Win32 Universal Release"
# Name "html - Win32 Universal Debug"
# Name "html - Win32 Unicode Release"
# Name "html - Win32 Unicode Debug"
# Name "html - Win32 Release"
# Name "html - Win32 Debug"
# 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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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,742 +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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "net - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "net - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "net - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "net - Win32 DLL Universal Unicode Release"
# Name "net - Win32 DLL Universal Unicode Debug"
# Name "net - Win32 DLL Universal Release"
# Name "net - Win32 DLL Universal Debug"
# Name "net - Win32 DLL Unicode Release"
# Name "net - Win32 DLL Unicode Debug"
# Name "net - Win32 DLL Release"
# Name "net - Win32 DLL Debug"
# Name "net - Win32 Universal Unicode Release"
# Name "net - Win32 Universal Unicode Debug"
# Name "net - Win32 Universal Release"
# Name "net - Win32 Universal Debug"
# Name "net - Win32 Unicode Release"
# Name "net - Win32 Unicode Debug"
# Name "net - Win32 Release"
# Name "net - Win32 Debug"
# 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.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\urlmsw.cpp
# 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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "odbc - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "odbc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "odbc - Win32 Debug" (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)" == "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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase252d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug
!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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /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 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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "odbc - Win32 DLL Universal Unicode Release"
# Name "odbc - Win32 DLL Universal Unicode Debug"
# Name "odbc - Win32 DLL Universal Release"
# Name "odbc - Win32 DLL Universal Debug"
# Name "odbc - Win32 DLL Unicode Release"
# Name "odbc - Win32 DLL Unicode Debug"
# Name "odbc - Win32 DLL Release"
# Name "odbc - Win32 DLL Debug"
# Name "odbc - Win32 Universal Unicode Release"
# Name "odbc - Win32 Universal Unicode Debug"
# Name "odbc - Win32 Universal Release"
# Name "odbc - Win32 Universal Debug"
# Name "odbc - Win32 Unicode Release"
# Name "odbc - Win32 Unicode Debug"
# Name "odbc - Win32 Release"
# Name "odbc - Win32 Debug"
# 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 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
!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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
!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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxexpat - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxexpat - Win32 Debug" (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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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"
!ENDIF
# Begin Target
# Name "wxexpat - Win32 DLL Universal Unicode Release"
# Name "wxexpat - Win32 DLL Universal Unicode Debug"
# Name "wxexpat - Win32 DLL Universal Release"
# Name "wxexpat - Win32 DLL Universal Debug"
# Name "wxexpat - Win32 DLL Unicode Release"
# Name "wxexpat - Win32 DLL Unicode Debug"
# Name "wxexpat - Win32 DLL Release"
# Name "wxexpat - Win32 DLL Debug"
# Name "wxexpat - Win32 Universal Unicode Release"
# Name "wxexpat - Win32 Universal Unicode Debug"
# Name "wxexpat - Win32 Universal Release"
# Name "wxexpat - Win32 Universal Debug"
# Name "wxexpat - Win32 Unicode Release"
# Name "wxexpat - Win32 Unicode Debug"
# Name "wxexpat - Win32 Release"
# Name "wxexpat - Win32 Debug"
# 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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxjpeg - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxjpeg - Win32 Debug" (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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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"
!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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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 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 /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /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 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 /MDd /W1 /Od /GR /GX /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 /MDd /W1 /Od /GR /GX /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"
!ENDIF
# Begin Target
# Name "wxjpeg - Win32 DLL Universal Unicode Release"
# Name "wxjpeg - Win32 DLL Universal Unicode Debug"
# Name "wxjpeg - Win32 DLL Universal Release"
# Name "wxjpeg - Win32 DLL Universal Debug"
# Name "wxjpeg - Win32 DLL Unicode Release"
# Name "wxjpeg - Win32 DLL Unicode Debug"
# Name "wxjpeg - Win32 DLL Release"
# Name "wxjpeg - Win32 DLL Debug"
# Name "wxjpeg - Win32 Universal Unicode Release"
# Name "wxjpeg - Win32 Universal Unicode Debug"
# Name "wxjpeg - Win32 Universal Release"
# Name "wxjpeg - Win32 Universal Debug"
# Name "wxjpeg - Win32 Unicode Release"
# Name "wxjpeg - Win32 Unicode Debug"
# Name "wxjpeg - Win32 Release"
# Name "wxjpeg - Win32 Debug"
# 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

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