Compare commits

...

3936 Commits

Author SHA1 Message Date
Bryan Petty
f48a7830ea This commit was manufactured by cvs2svn to create tag 'WX_2_5_0_1'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_5_0_1@23235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 01:32:14 +00:00
Julian Smart
b1c1e25bb1 No change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 01:32:14 +00:00
Stefan Csomor
9f6b8316a3 typo corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 01:22:01 +00:00
Stefan Csomor
c681bd248f unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 01:12:29 +00:00
Stefan Csomor
b1f6de838e unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:59:04 +00:00
Julian Smart
0e7ac69ea9 Compile extended RTTI in BC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:44:06 +00:00
Julian Smart
67b283a9c6 Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:42:42 +00:00
Stefan Csomor
c34e3c7930 unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:39:07 +00:00
Stefan Csomor
63691d4ff9 unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:28:38 +00:00
Julian Smart
3d82ef9b7c Some cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:23:34 +00:00
Julian Smart
9dc6871e8f Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-26 00:02:19 +00:00
Stefan Csomor
e70b4f1095 unicode adaptions, menu support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:33:36 +00:00
Stefan Csomor
ed45345eb1 unicode and linkage corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:31:41 +00:00
Stefan Csomor
5b59fbdddf removing unnecessary specializations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:31:19 +00:00
Stefan Csomor
583150e369 linkage and unicode corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:29:55 +00:00
Stefan Csomor
6c7a1f8274 RTTI accessors for menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:26:49 +00:00
Václav Slavík
252b53f55c static debug build is the default now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:18:45 +00:00
Julian Smart
96d5885406 New default configuration is debug/static
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 21:15:24 +00:00
Václav Slavík
fdec2f7d51 removed dependencies from VC++ projects, they break static libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 21:01:05 +00:00
Václav Slavík
80b2db4ee6 added IMPLEMENT_APP_CONSOLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 20:48:47 +00:00
Robin Dunn
b6e2eddeaf avoid a bug in Carbon headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 20:22:05 +00:00
Julian Smart
05aa1fc78c Unicode compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 19:40:30 +00:00
Julian Smart
727673714e Unicode fix; removed old project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 18:56:26 +00:00
Julian Smart
31d44d0fd5 Fixed Unicode glitch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 18:51:55 +00:00
Julian Smart
2eb7ed882f Needed adv library for xrcdemo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 18:48:04 +00:00
Julian Smart
c59f3b2d96 Fixed redefinition of i
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 18:42:38 +00:00
Václav Slavík
6a8c7c70c9 compilation fix for wxUSE_UNICODE_MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 17:33:58 +00:00
Julian Smart
1babe8fdbb Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 17:24:20 +00:00
Václav Slavík
356583d446 include expat in distribution tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 16:30:17 +00:00
Václav Slavík
1b23f6f700 there's no such thing as <typeinfo.h>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 15:41:25 +00:00
Chris Elliott
19fea8580e fix typo in Borland build instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 15:04:43 +00:00
Chris Elliott
1a81e3dba8 revert instructions for makefile.sc as new makefiles not ready
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 15:03:29 +00:00
Julian Smart
385facb748 Made CCS_VERT definition more general
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 14:20:26 +00:00
Julian Smart
ffcb4ee424 WinCE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 14:15:20 +00:00
Julian Smart
9ce43bfae9 Fixes for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 14:10:25 +00:00
Julian Smart
71da8cffa1 Added WinCE files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 13:28:48 +00:00
Julian Smart
0f7c9ebe1c Removed redundant file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 13:07:40 +00:00
Julian Smart
1d6d8f1717 Added some missing settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 13:02:20 +00:00
Julian Smart
bc9fa1f694 Reverted changes in accessible.tex that caused syntax error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 11:27:56 +00:00
Julian Smart
3e5bdb369b Corrected typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 09:56:53 +00:00
Julian Smart
5318ee3636 Added readme copying to tardist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 09:56:20 +00:00
Julian Smart
c734a8b9a4 Minor change in case m_log is null
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 09:32:13 +00:00
Julian Smart
88d6c98889 Correction for Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 08:13:13 +00:00
Stefan Csomor
df3a88afd7 generic template must not carry linkage clause
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 07:34:58 +00:00
Stefan Csomor
0c6b008469 adding style to constructors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 23:42:33 +00:00
Stefan Csomor
5731f7db6c adding style to constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 23:41:36 +00:00
Stefan Csomor
499a9a6222 switching to registry based type info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 23:41:05 +00:00
Stefan Csomor
b6ac8ca0ff adaption custom types to new macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 23:39:37 +00:00
Stefan Csomor
492f9a9e9b switching type info to registration base and lazy lookup (multi-lib-linkage problems with old approach)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 23:36:46 +00:00
Julian Smart
01025de029 Corrected sample.r name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 22:59:36 +00:00
Vadim Zeitlin
41d8fca027 fixes for the list ctrl layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 22:46:59 +00:00
Vadim Zeitlin
f7f97bf31c warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 22:09:34 +00:00
Václav Slavík
9698d2445d copy setup.h in every VC++ project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 21:40:47 +00:00
Václav Slavík
cd1feecb09 copy setup.h in every project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 21:39:46 +00:00
Stefan Neis
189d1ae7a0 Use "Base" version of wxBell on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 20:11:54 +00:00
Julian Smart
87cae034a5 Added some files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 20:03:46 +00:00
Julian Smart
4c4cba256d Added maketarballs script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 19:59:29 +00:00
Stefan Neis
e484468721 Fixed #pragma interface/implementation handling for old compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 16:38:02 +00:00
Stefan Neis
a1541f5f05 Use wxIconLocation instead of wxIcon (as in the other ports).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:56:19 +00:00
Václav Slavík
79902653c8 fixed wrong WXDLLEXPORT usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:43:58 +00:00
Stefan Csomor
91c9dbdc97 linkage corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:41:05 +00:00
Julian Smart
c3ced9ec6c Removed warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:27:21 +00:00
Julian Smart
588cf92fcb Worked around a problem whereby the MSW _native_ horiz. scrollbar
was created instead of the Univ scrollbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:25:13 +00:00
Stefan Csomor
1c263d5667 linkage corrections, destructors added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 15:22:07 +00:00
Julian Smart
7d2d5d8195 Eliminated bizarre VC++ internal compiler errors, perhaps related to
enabling C++ RTTI


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 14:30:23 +00:00
Stefan Neis
8e5052faec Try to get along without wxWakeUpMainThread (wxBase/GTK/Motif/X11 won't
compile with it).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 14:26:50 +00:00
Stefan Neis
f0f044dcbe Compilation fixes for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 14:08:44 +00:00
Václav Slavík
1b5ff3a3fe fix gcc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 13:27:56 +00:00
Stefan Csomor
8347b97ada moving xti includes after the EXTENDED_RTTI clause
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 13:21:37 +00:00
Julian Smart
53b74313b0 Don't include xti.h if not using extended RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 13:04:30 +00:00
Václav Slavík
ab0881c71c fixed gcc warnings and reformatted some pieces of code to be a bit readable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 12:55:22 +00:00
Stefan Csomor
2abce5157d gcc /vc6 workarounds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 12:22:08 +00:00
Julian Smart
bc9fb5723a Added some window style metadata
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 11:35:44 +00:00
Stefan Neis
4cbbb6316d More fixes/improvements for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 11:35:13 +00:00
Julian Smart
c125040724 Added missing wxCalendarCtrl styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 11:30:14 +00:00
Julian Smart
73c36334e7 Added style metadata for selected controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 11:26:25 +00:00
Václav Slavík
1c3a6972f4 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 10:23:35 +00:00
Stefan Neis
f284605f65 Fixed compile error (seen on OS/2).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 10:19:37 +00:00
Stefan Neis
fe5321b6d8 Removed superfluous conditional include.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 09:56:16 +00:00
Stefan Neis
5d66debfce Minor correction for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 09:52:09 +00:00
Julian Smart
0497e17283 Doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 08:16:37 +00:00
Stefan Neis
5cc55caf2b Some more fixes for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 07:36:36 +00:00
Stefan Csomor
0e4534295e avoid streaming of 'private' children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 22:49:55 +00:00
Stefan Csomor
f3291a824a window flags extensions, streaming callback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 22:49:08 +00:00
Stefan Csomor
8ffc1732c2 flags extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 22:47:56 +00:00
Stefan Csomor
0886e25499 flags extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 22:37:11 +00:00
Václav Slavík
54eba47d04 fixed bundles dependency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 21:51:13 +00:00
Václav Slavík
e24124667e XTI changes update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 21:10:58 +00:00
Václav Slavík
0a20646948 Unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 21:01:58 +00:00
Stefan Csomor
9c8046dded redistribution of code for different library parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 19:40:04 +00:00
Václav Slavík
9d5f4fbbd4 copy bitmaps to runtime directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 13:01:20 +00:00
Václav Slavík
0c93d67c86 get rid of warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 12:54:55 +00:00
Václav Slavík
0bdb08e7ef builtin iODBC build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 12:45:34 +00:00
Václav Slavík
0a3f5f5767 use forward instead of backward slashes in filesnames passed to gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 12:22:51 +00:00
Václav Slavík
c9c2720de8 use -a8 instead of -a4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 12:20:53 +00:00
Václav Slavík
b328fad371 regenerated with fixed version of bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 11:38:02 +00:00
Václav Slavík
e2281645f2 minor fix (no real effect)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 09:41:23 +00:00
Julian Smart
aba17e091c Removed __WXUNIVERSAL__ part of condition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 09:30:28 +00:00
Robin Dunn
e06b17c045 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 02:56:37 +00:00
Robin Dunn
5dacf03c57 removed duplicate method def
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 02:51:21 +00:00
Robin Dunn
1e52188741 fixes for new lib dirs for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 02:50:33 +00:00
Robin Dunn
116d6bea10 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 02:49:13 +00:00
Robin Dunn
8030d60631 Added #if wxUSE_CMDLINE_PARSER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 02:38:34 +00:00
Robin Dunn
d2c0a964e7 Initialize default values for the tool button size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 01:44:09 +00:00
Stefan Csomor
067e9be685 xti property extensions, style bits additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 00:41:33 +00:00
Stefan Csomor
cb73e6001f xti additions / changes, trying to reduce dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 00:40:53 +00:00
Stefan Csomor
ae820c693a xti additions / changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 00:37:55 +00:00
Stefan Csomor
b192f49963 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 00:36:26 +00:00
Robin Dunn
f29395d0e4 Don't use wxID_ANY so events from child wxListCtrl's don't confuse the
wxListBook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 23:57:06 +00:00
Robin Dunn
f89fa59caa Oops, forgot to remove the #includ
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 23:03:07 +00:00
Robin Dunn
318553524d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:48:05 +00:00
Robin Dunn
edadef3f00 Added wrappers for wxBookCtrl and wxListbook. wxNotebook now derives
from wxBookCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:46:58 +00:00
Robin Dunn
6946b604e8 Commented out wxToolBarSimple since it is fully deprecated now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:45:35 +00:00
Robin Dunn
f94e8b87e8 Extra testing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:44:36 +00:00
Robin Dunn
7e955e573b regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:43:08 +00:00
Mattia Barbon
a29b270d4c Do not #include wxGUI headers in wxBase files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:08:44 +00:00
Vadim Zeitlin
f6f0900d30 fixed text control creation broken by my MacPreControlCreate() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 22:00:29 +00:00
Vadim Zeitlin
c59da60ade try to size the list control correctly even when it has scrollbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 21:59:47 +00:00
David Elliott
275341c036 Show(): Send a wxWindows size event just before calling makeKeyAndOrderFront:
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 21:54:43 +00:00
Mattia Barbon
ba8a4f660a Fix building wxSTC as a DLL using MinGW GCC 3.x.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 21:24:09 +00:00
Robin Dunn
e8f60bac1a regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 21:02:44 +00:00
Vadim Zeitlin
16aa9c84bc added bookctrl.h and listbook.h; moved bookctrl.cpp to the correct place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 16:59:33 +00:00
Julian Smart
fa2f17a37c Updated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 16:30:08 +00:00
Julian Smart
9c6cef05a2 Added xti*.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 16:18:25 +00:00
Vadim Zeitlin
73fb9ebeee added bookctrl.h, listbook.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 15:37:21 +00:00
Vadim Zeitlin
f1160963c6 (blind) fix for MSW crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 15:29:40 +00:00
Julian Smart
16d0c403fa Removed erroneous return statements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 10:52:01 +00:00
Julian Smart
4ef29fb558 Added wxUSE_EXTENDED_RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 10:25:32 +00:00
Julian Smart
6b96052677 Added a line to end of file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 10:21:44 +00:00
Václav Slavík
cc20da4127 added install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 10:03:14 +00:00
Václav Slavík
42c37decc5 more Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 10:00:25 +00:00
Václav Slavík
2d26882cdf fixed setup.h copying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 09:51:49 +00:00
Václav Slavík
ff5ea9e7a3 regenerated, with os/2 fixes again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 09:47:23 +00:00
Václav Slavík
149d9543f5 fixed custom build step for VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 09:46:57 +00:00
Julian Smart
5b24f0d3a6 Include imaglist.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 08:41:34 +00:00
Robin Dunn
2d480e4045 wxNotebookSizer ctor was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 05:48:38 +00:00
Vadim Zeitlin
52d3703e0a listbkg.cpp, not listbook.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 00:08:15 +00:00
Vadim Zeitlin
232d895d8f regenerated after listbkg.cpp addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:55:13 +00:00
Václav Slavík
394b04a83e regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:48:16 +00:00
Vadim Zeitlin
c16b8e18ff added wxListbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:16:41 +00:00
Vadim Zeitlin
0e012a93ad regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:16:39 +00:00
Vadim Zeitlin
4e62c3fd3b make it possible to use this sample for wxListbook testing too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:12:41 +00:00
Vadim Zeitlin
5b5e4f325c added checks for wxUSE_LISTBOOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:11:54 +00:00
Vadim Zeitlin
ade4eb65af added wxBookCtrlSizer; derive wxNotebookSizer from it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:09:35 +00:00
Vadim Zeitlin
1e54be64fd ensure that GetItemRect() returns the real rect and not 0 even if it's called before first OnIdle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:08:10 +00:00
Vadim Zeitlin
e9c0df38e7 added wxListbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 23:06:36 +00:00
Mattia Barbon
34a0c9f4c1 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 22:00:12 +00:00
Vadim Zeitlin
19c43a77ce no changes, just resolved conflicts (due to the fact that I had forgotten to commit this file before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 20:52:02 +00:00
Vadim Zeitlin
ea4ff2ad5a corrected wxUSE_BOOKCTRL test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 20:45:49 +00:00
Stefan Csomor
4f8ffae109 metadata support for metadata
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 20:27:46 +00:00
Stefan Csomor
8f83dfee77 destructor should not clear the ControlHandle, otherwise it will not get deleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 18:48:18 +00:00
Mattia Barbon
30d2b71da3 wxMotif warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 15:10:16 +00:00
Václav Slavík
20e5860f1f regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 14:49:41 +00:00
Václav Slavík
9a33ef7c3c backported HTML tables horizontal size fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 14:47:05 +00:00
Vadim Zeitlin
5307103227 hack to at least let the sample start up (it still crashes later) under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 14:44:42 +00:00
Václav Slavík
fee0970200 fixed broken files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 13:58:50 +00:00
Vadim Zeitlin
3e8aa6eb32 added bookctrl.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 13:29:02 +00:00
Vadim Zeitlin
712f40ca5e corrected CHECK in InsertPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 13:27:41 +00:00
Vadim Zeitlin
74f8518b5c replcaeed ints with size_t to match the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 13:08:00 +00:00
Vadim Zeitlin
8d34bf5cc9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 12:54:31 +00:00
Mattia Barbon
789d0a3dd9 wxGTK compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 12:44:52 +00:00
Mattia Barbon
64b090c72a Compilation fixes for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 12:38:26 +00:00
Václav Slavík
66cb53f7a9 Unicode compilation fixes for OGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 09:06:58 +00:00
Václav Slavík
1484b5cc70 Unicode compilation fixes for OGL (patch #791967)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 09:05:56 +00:00
Julian Smart
ff7047fde5 Updated section on XRC-writing tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 08:05:22 +00:00
Stefan Csomor
786a2425fb extended RTTI support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 06:37:30 +00:00
Stefan Csomor
b0a877ec93 support for RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 06:33:51 +00:00
Stefan Csomor
c90b8250d9 added support for leaving out <embedded objects> that are created during their parent's creation and should not be streamed out separately. Support for empty element tags when reading in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 06:32:09 +00:00
Stefan Csomor
c1d6d0f9e8 added wxDateTime to the streamable custom types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 06:30:19 +00:00
Stefan Csomor
986a98c6e9 added support for allocation-creation method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-21 06:27:11 +00:00
Vadim Zeitlin
15aad3b938 created wxBookCtrl which will be tje base class for wxNotebook and wxListbook; moved almost all of wxNotebookBase code into it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 22:57:07 +00:00
Vadim Zeitlin
87f086bcbd added missing headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 22:51:21 +00:00
Stefan Neis
bd3b171d3f Split src/os2/utils.cpp in two to support non-monolithic builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 18:53:31 +00:00
David Elliott
bd8e6e3742 The default state for the first radio button in a group should be selected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 17:44:37 +00:00
Stefan Neis
283ed244ad Compilation fixes for gcc-3.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 17:02:09 +00:00
Mattia Barbon
8ae94823a3 Keep order of nodes when wxHashMap is resized; this ensures
that wxHashTable has the same behaviour when wxUSE_STL=1 as
when wxUSE_STL=0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 16:59:17 +00:00
David Elliott
6f2ec3c3de Fix autoresizingMask when scrolling is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 16:02:31 +00:00
Václav Slavík
3d8c1de070 more OS/2 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 16:00:55 +00:00
Václav Slavík
4eba184013 updated the RPMs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 15:14:12 +00:00
Václav Slavík
28a34fc7d0 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 15:13:09 +00:00
David Elliott
75e4856bba * Use a subclass of NSView for the dummy view which overrides hitTest: to
return nil.  That tells Cocoa never to send it any mouse events.
* Set the autoresizingMask of the hidden view on the dummy view
* Added some code to paint green over the dummy view.  It makes debugging
  some things easier.  Change the #undef WXCOCOA_FILL_DUMMY_VIEW to enable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 14:45:48 +00:00
Václav Slavík
96c1699d51 (blind) OS/2 build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 13:56:20 +00:00
David Elliott
cc6f960f49 Normal wxWindow::Close() behavior
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 13:37:46 +00:00
Stefan Neis
4c15b7aff2 Added some missing brackets required by autoconf on OS2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 10:29:08 +00:00
Václav Slavík
fa8e95cbdb new makefiles update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 10:02:17 +00:00
Václav Slavík
fad5a51ff8 how to build new RPMs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 09:50:17 +00:00
Václav Slavík
ee100c4d36 removed a typo(?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 09:39:41 +00:00
Václav Slavík
a4d72b9486 wxMotif compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 09:20:28 +00:00
Václav Slavík
dd4b14de7e more Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 09:01:57 +00:00
Václav Slavík
54385bdb3f Unicode compilation fixes for wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 08:39:47 +00:00
Václav Slavík
c6441a0d74 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 08:13:08 +00:00
Václav Slavík
79608eef23 regenerated with ac-2.57
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 08:12:06 +00:00
Václav Slavík
93b512a0b8 there's no reason why wxrc should link against xrc library, it doesn't need it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 08:10:55 +00:00
Mattia Barbon
760d3c7cd3 Fixes for wxHashTable when wxUSE_STL=1:
wxHashTable must work like an hash_multimap, not an hash_map.
wxHashTable::Delete is supposed to actually delete entries
more tests in console sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 21:17:04 +00:00
Stefan Csomor
8b7ac60523 switching to wxEmptyString to satisfy linker after wxxVariant constructor change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 19:45:52 +00:00
Stefan Csomor
12a5e73be6 changing wxxVariant signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 19:44:15 +00:00
Julian Smart
d56cc7b1bc Correcting typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 19:27:52 +00:00
Václav Slavík
a5b8e8bf18 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 18:02:43 +00:00
Václav Slavík
99045723c5 <wx-lib>expat</wx-lib> is nonsense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 17:57:40 +00:00
Stefan Csomor
c44a270570 removing rtti special functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 17:28:34 +00:00
Václav Slavík
62b78322e1 wxStrdup(NULL) doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 17:27:04 +00:00
Václav Slavík
4b1f63604b OS/2 doesn't use lib prefix for libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 16:58:02 +00:00
Stefan Csomor
a06bb527dd RTTI extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 16:48:06 +00:00
Stefan Csomor
f0a126fe7a switching back to normal accessors, workaround not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 16:44:01 +00:00
Stefan Csomor
b8d5be011d XTI extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 16:40:20 +00:00
Julian Smart
9409aa35b8 Applied patch [ 778716 ] Fix resolve in smapi.cpp for UNICODE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 15:51:04 +00:00
Julian Smart
196be0f137 Warning fixes from ABX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 15:40:58 +00:00
Chris Elliott
7945bfb41d CBuilder & IDE details Not appropriate for new makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 15:16:42 +00:00
Chris Elliott
aa43a59b91 CBuilder project creation files Not appropriate for new makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 15:15:47 +00:00
David Elliott
2691697575 Use NSBox with the NSBoxSeparator box type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 14:51:08 +00:00
David Elliott
c5172ed1bf Override CocoaSetEnabled() to call -[NSControl setEnabled:]
Do NOT forget to override this in subclasses which use a Cocoa view
not derived from NSControl.  Crashes will result.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 14:49:28 +00:00
David Elliott
761bdfaaa9 Override CocoaSetEnabled() to do nothing. Although static lines are
controls in the wxWindows sense, they are not in the Cocoa sense.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 14:47:24 +00:00
David Elliott
adb4816c3e Added machinery to Enable/Disable windows. When a window is disabled, it
disables all of its children.  Every window maintains a bool indicating
whether it should be enabled (i.e. Enable() was called on it directly).
When a window is reenabled, it reenables children, but only if they are
actually supposed to be enabled. Override CocoaSetEnabled() in subclasses
to actually enable/disable a Cocoa control.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 14:45:54 +00:00
Julian Smart
5751dd32c7 Fix to remove CW/Mac warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 12:37:36 +00:00
Stefan Csomor
2202608853 unicode fixes, enabling notebook images again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 10:00:56 +00:00
Julian Smart
3029e588e0 Use _NO_THEMES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 08:41:17 +00:00
David Elliott
4a3dcf1de1 Wrap NSTableView in an NSScrollView and disable the header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 04:27:12 +00:00
David Elliott
8ea5801e9e Use bounds rect instead of frame rect when positioning subviews
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 04:10:47 +00:00
David Elliott
c5bd91912f Use setAutoresizingMask: NSViewMinYMargin to keep subviews in the same
position relative to the wxWindows coordinate system


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-19 04:08:27 +00:00
Vadim Zeitlin
b45ed7a273 use wxWindowBase::Create() instead of duplicating its code in MacPreControlCreate()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:57:34 +00:00
Vadim Zeitlin
40fa47e0d3 added missing Create() implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:56:57 +00:00
Vadim Zeitlin
1b9a0df679 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:56:42 +00:00
Vadim Zeitlin
3ffb81a423 return immediately if the XPM is bad instead of spitting out thousands of error messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:55:17 +00:00
Vadim Zeitlin
17f8d2a701 commented out annoying wxLogDebug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:54:19 +00:00
Vadim Zeitlin
2943b2c6af deleted unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 23:49:48 +00:00
David Elliott
c22469c6b7 SetInitialFrameRect: use frameRect.size.height to calculate frameRect.origin.y
Fixes bug where size.y!=frameRect.size.height (e.g. it is -1)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 19:21:32 +00:00
David Elliott
b915b80565 DoMoveWindow: setNeedsDisplay:YES for the superview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 19:15:53 +00:00
Václav Slavík
d5fc095cf5 OS/2 fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 18:32:53 +00:00
David Elliott
d0a5e34a08 * Implement GetValue() and SetValue().
* Send event when clicked.
* Implement radio button grouping.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 18:27:48 +00:00
David Elliott
a0c6a355b7 Implement GetValue() and SetValue() and send an event when clicked
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 18:21:46 +00:00
Julian Smart
9fff6f7fd8 Fixed wxX11 compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 18:19:25 +00:00
Stefan Csomor
6a89f9ee42 RTTI simplifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 09:59:18 +00:00
Stefan Csomor
1978421a6d rtti api mods added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 09:57:02 +00:00
Stefan Csomor
404f1d80d8 scope added for keyboard handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 09:56:07 +00:00
Stefan Csomor
208fd16ca7 refactoring getters and setters to avoid signature madness, typeinfo is carrying string conversion info now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 09:53:09 +00:00
Mattia Barbon
3f2c383971 Correctly export events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 09:30:45 +00:00
David Elliott
03fc8e9795 wxCocoa: Added NSMutableArray and NSTableColumn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 02:19:12 +00:00
David Elliott
9f5fd07701 wxCocoa: added NSTableView.(mm|h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 02:16:53 +00:00
David Elliott
bcaadf7eae some more wxListBox support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 02:14:53 +00:00
David Elliott
2e024d8690 Added NSTableView support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-18 02:12:42 +00:00
Stefan Neis
d1bab56647 Completely reworked OS/2 thread implementation.
Moved wxConditionInternal from src/msw/thread.cpp to include/wx/thrimpl.cpp
        to give OS/2 the possibility to reuse the code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 23:32:00 +00:00
David Elliott
e08efb8dd9 Handle setting of client size for all types of windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 23:23:26 +00:00
Stefan Csomor
b7aec135d7 several patches and extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 21:15:39 +00:00
Stefan Csomor
43cfe46c31 added WXK_COMMAND
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 21:14:28 +00:00
Mattia Barbon
469349b5c8 Check for NULL base class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 19:53:51 +00:00
Stefan Csomor
768dc88a34 textcontrol handling change for mac (execute event in mid stream)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 19:47:00 +00:00
Stefan Csomor
1ea39a0399 textcontrol handling change for mac (execute event in mid stream)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 19:41:16 +00:00
Julian Smart
d2699196d3 Must call DoMoveWindow in Create() or buttons may not be
moved


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 16:31:18 +00:00
Stefan Csomor
99f677aef3 unicode wxMac CW fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 16:25:37 +00:00
Stefan Neis
82499c49e4 Added OS/2 to the list of platforms known to AC_BAKEFILE_SHARED_LD.
(Although it should not be needed since I always build static libs on OS/2?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:29:00 +00:00
Julian Smart
4f10962bc0 Peter Lenhard's WinCE DoDraw[Elliptic]Arc additions: the WinCE-specific
calling code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:14:38 +00:00
Václav Slavík
d424f5ae6d more visible banner after installation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:07:58 +00:00
Václav Slavík
f815011ffb Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:00:46 +00:00
Václav Slavík
6f568182ff Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 14:55:33 +00:00
Stefan Neis
e223b0999f Added some special code to make generated configure script OS/2 compatible
no matter what platform it is generated on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 14:53:27 +00:00
Julian Smart
c26275faab Removed redundant DSPs
Fixed default size of splitter in splittree sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 13:55:44 +00:00
Václav Slavík
da0379249b removed --enable-compat20
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 13:14:44 +00:00
Václav Slavík
a3bf7524f3 removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:50:53 +00:00
Václav Slavík
4a93ea29b5 netutils code is MSW-only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:48:18 +00:00
Stefan Csomor
f73bc315aa unicode wxMac CW fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:00:28 +00:00
Václav Slavík
40b46a4945 don't test for Flex and Yacc, we don't use them anymore (contrib/deprecated uses pregenerated versions)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:35:44 +00:00
Julian Smart
a388bbbefb Misc. contrib compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:31:04 +00:00
Václav Slavík
187cf772fa regenerated makefiles after fixing files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:17:34 +00:00
Václav Slavík
f75d778149 restored wxBuildOptions class, for backward compatibility with wx-2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:14:18 +00:00
Julian Smart
34f7e40fa9 Fixed compilation of OGL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:14:08 +00:00
Václav Slavík
c80217d107 wxMutexGuiEnter/Leave didn't work because this file is compiled with wxUSE_GUI=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:59:13 +00:00
Václav Slavík
21041c70a3 restored changes accidentally reverted by previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:41:12 +00:00
Václav Slavík
1359768207 no wxToolBarSimple
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:35:43 +00:00
Václav Slavík
0e0d594d1a removed unused wxObject::Dump
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:34:45 +00:00
Václav Slavík
6eabf58cec have TryValidator even if wxUSE_VALIDATORS=1, so that wxBase library can be used by GUI ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:33:25 +00:00
Václav Slavík
b880adecc4 build options signature is too long, use more lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:31:54 +00:00
Václav Slavík
e1a4f817b0 check for WXWIN_COMPATIBLITY settings, they affect binary compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:30:46 +00:00
Václav Slavík
bf26b5e1de don't change WXWIN_COMPATIBLITY settings, it affects binary compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:30:15 +00:00
Julian Smart
8a82c9ecc9 Moved wxToolBarSimple to deprecated library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:20:08 +00:00
Stefan Csomor
1d42ad9a21 unicode for mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 07:37:06 +00:00
Stefan Csomor
365796b153 unicode for mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 07:16:09 +00:00
Stefan Csomor
7d671c0818 unicode for mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 06:38:42 +00:00
Václav Slavík
b7c702867a removed unneeded #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 22:30:54 +00:00
Mattia Barbon
548bf4b717 MSVC 5 compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:39:23 +00:00
Václav Slavík
4b20974a9b added configtool, helpview and emulator makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:30:16 +00:00
Václav Slavík
0772d8742c afterstd.h is wxBase header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:26:35 +00:00
Václav Slavík
296e4c2014 not used anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:26:05 +00:00
Václav Slavík
6c04a87329 removed old bc++ makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:22:26 +00:00
Václav Slavík
eb69fda554 ODBC library is built when wxUSE_GUI=0, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 19:54:59 +00:00
Václav Slavík
6eb90f821f ODBC is part of wxBase now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 19:08:27 +00:00
Stefan Csomor
c32a538aba unicode for mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 16:46:24 +00:00
Stefan Csomor
5f3f0f1725 unicode for mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 16:46:23 +00:00
Stefan Csomor
69aa21acc9 corrected include for __WXMAC__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 16:37:01 +00:00
Václav Slavík
ffef10f672 output -Wl,--subsystem,console for Mingw if any GUI library is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 16:12:31 +00:00
Václav Slavík
ac9a3c615a moved WinMain into the application even for static build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 15:30:25 +00:00
Stefan Neis
35c49c4bb6 Some fixes for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 14:25:45 +00:00
Václav Slavík
19c35fa587 forgot to commit some regenerated files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 13:37:20 +00:00
Václav Slavík
34cf9bb509 added helpview bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 13:24:11 +00:00
Vadim Zeitlin
a9e3ce8f5a typo in assert (patch 789156)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 12:09:56 +00:00
Vadim Zeitlin
80fdb8d64f fix bug with entries present in both global and local files (patch 773360)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 12:07:03 +00:00
Gilles Depeyrot
609533d54d applied fixes for CodeWarrior compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 11:58:06 +00:00
Robin Dunn
77762d0f1e reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 23:12:27 +00:00
Robin Dunn
1d18f8b43f wxPostScriptPrinter needs wxGenericPrintDialog but it wasn't being
built on Mac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 23:02:55 +00:00
Vadim Zeitlin
aaae069f9a don't create a multiline text control in the text editor (even not under MSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 22:20:33 +00:00
Václav Slavík
75a0a7b7de change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 22:08:13 +00:00
Václav Slavík
3df38e2077 expat must be added to the template, not generated wxWindows.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:42:52 +00:00
Václav Slavík
6acf2ef6cb change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:31:05 +00:00
Václav Slavík
239741ff16 Watcom compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:23:32 +00:00
Václav Slavík
0c4fdf1d3d VC++ compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:22:33 +00:00
Václav Slavík
ee929bcff4 change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:20:32 +00:00
Václav Slavík
2c02ec0599 include compiler name in plugin DLL name on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 17:21:02 +00:00
Julian Smart
684761db46 Misc. corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 16:17:40 +00:00
Julian Smart
e7bbd8743c Regenerated Makefile.in after printps.cpp changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 14:29:49 +00:00
Václav Slavík
7a23b2e697 removed old makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 14:19:06 +00:00
Julian Smart
12bdd77c85 Can now switch between PostScript and WIN32 print dialogs
by setting the value of wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW.
Added first part of Peter Lenhard's WinCE DrawEllipticArc
implementation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 10:17:14 +00:00
Julian Smart
e32f486958 Put printdc.cpp into all GUI builds because there's not a way
of adding it to a MSW/Univ build otherwise
Now includes PostScript and WIN32 print dialogs in MSW/Univ build,
and setup.h determines which will be used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 10:11:41 +00:00
Julian Smart
6f4767ace2 Corrected silly recursion mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 09:44:52 +00:00
Julian Smart
a430d03e5f Corrected typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 08:43:53 +00:00
Julian Smart
a61bbf8767 Applied patch2 of [ 703990 ] attrib support in wxGTK2 textctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 08:17:03 +00:00
Julian Smart
2913c590b0 Applied patch [ 787350 ] removes warnings in FL under Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 08:07:24 +00:00
Stefan Csomor
7f5d8b0085 setter by ref for
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 05:41:11 +00:00
Vadim Zeitlin
fc943dca4a prevent infinite recursion -- not a fix for the real bug but at least we don't crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 00:21:02 +00:00
Vadim Zeitlin
26b0b99804 German translations update from Martin Jost (patch 782996)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:52:10 +00:00
Václav Slavík
065a32a58f install locales
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:11:21 +00:00
Václav Slavík
fe6e581857 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:09:01 +00:00
Vadim Zeitlin
bb0a3c4aff compilation fix for the last fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:00:33 +00:00
Vadim Zeitlin
4f45ba63f4 an alternative fix which should replace patch 781918
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 22:57:25 +00:00
Vadim Zeitlin
d566b182a5 warning fixes for Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 21:08:41 +00:00
Vadim Zeitlin
c2a331e027 unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 21:04:41 +00:00
Václav Slavík
97a8bcf232 no longer meaningful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 21:01:17 +00:00
Václav Slavík
cb12824340 Expat licensing info added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 21:00:13 +00:00
Václav Slavík
2bbb6f0f31 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:58:46 +00:00
Václav Slavík
dd672d67bd VC++ project files dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:57:07 +00:00
David Elliott
cf774b6767 Stub for wxRegion::Offset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:56:21 +00:00
Václav Slavík
d7313a611c compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:51:58 +00:00
Václav Slavík
ca58c9bbb8 added 'make dist' and misc fixes to installed headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:35:07 +00:00
David Elliott
448cbf1d4e Implemented toolbar/statusbar positioning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:34:07 +00:00
Václav Slavík
863110af35 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:27:05 +00:00
David Elliott
816c52cf7c Implemented window scrolling using wxWindowCocoaScroller
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:47:28 +00:00
David Elliott
d25aa543ae wxCocoa: Added NSScrollView definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:45:46 +00:00
Václav Slavík
0aa1258a1b GTK2 compilation fix for Vadim's compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:24:59 +00:00
Václav Slavík
343acb82b7 removing old makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:12:57 +00:00
Václav Slavík
2f8ff1cb6b re-added; this file should not be deleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:03:24 +00:00
Stefan Csomor
75890a3f39 xti macro fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:51:07 +00:00
Václav Slavík
2be028e23c reverted previous commit; include wx/timer.h in wxBase instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:30:16 +00:00
Václav Slavík
d5b12ad9a7 wxBase compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:20:51 +00:00
Václav Slavík
4368b1a640 fixed stupid typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:11:01 +00:00
Stefan Csomor
8acd402fb0 notebook page information objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:06:49 +00:00
Stefan Csomor
5174130757 rtti informations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:05:30 +00:00
Stefan Csomor
16a45a23d9 properties as collection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:03:06 +00:00
Stefan Csomor
fae7d15809 min and max setters added (xti)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:59:34 +00:00
Julian Smart
eddf00d7a8 Removed some more obsolete files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:53:46 +00:00
Václav Slavík
f36fb06dc3 removing old makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:35:57 +00:00
Julian Smart
9687fdeec4 Unicode-friendliness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:35:49 +00:00
Václav Slavík
3422227afc wxBase compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:30:37 +00:00
Julian Smart
1e00cf2c4c More Clear -> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:29:17 +00:00
Václav Slavík
1ee9f07ca1 removing old makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:13:25 +00:00
Václav Slavík
17283f91ee corrected DSW dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 16:49:50 +00:00
Václav Slavík
16fd964239 make wxrc installable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 16:39:20 +00:00
Julian Smart
1d14c0051c Clear -> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 16:29:34 +00:00
Václav Slavík
dce0742b30 fixed DSW dependencies for samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 16:18:41 +00:00
Václav Slavík
911740e77a complain if ar is missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 15:36:33 +00:00
Julian Smart
f7a8c1299b Misc warning fixes by ABX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 14:32:07 +00:00
Václav Slavík
36ac38fd13 added wxUSE_NO_MANIFEST=0 for easier testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 14:08:53 +00:00
Václav Slavík
7affac1cf2 added ALL_BASE_HEADERS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:38:07 +00:00
Václav Slavík
399a88248a use univ/setup.h when building wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:07:23 +00:00
Julian Smart
eb2693818c No significant changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:04:54 +00:00
Julian Smart
a52883bbd9 No significant change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:02:05 +00:00
Chris Elliott
dd54f5d305 move define to better place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:00:38 +00:00
Julian Smart
7de1e98d39 Removed some cruft
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 10:55:22 +00:00
Julian Smart
9f5a52b59b Don't need penwin.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 10:33:50 +00:00
Chris Elliott
50165591a5 fix bugs when compiling with dmars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 10:01:49 +00:00
Julian Smart
14112c7b78 Clear -> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 09:55:19 +00:00
Václav Slavík
b79a499394 DMC doesn't have w32api
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 09:17:45 +00:00
Julian Smart
61775320c5 Some updates (incomplete)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 09:04:36 +00:00
Julian Smart
74ee21fd66 Removed obsolete DSP file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 09:02:31 +00:00
Jouk Jansen
beeeb19c38 Committing in .
added spliiter.h for the definitions of wxSP* macros

 Modified Files:
 	wxWindows/utils/dialoged/src/winstyle.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 09:02:12 +00:00
Chris Elliott
3e22fb88f5 dmars does not have w32api.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 08:50:10 +00:00
Chris Elliott
01fd88a0e6 remove no longer treu comment about dmars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 08:46:33 +00:00
Jouk Jansen
40f2773111 Committing in .
OpenVMS compile support updated

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 06:33:43 +00:00
Robin Dunn
8a12f92d0d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 03:58:15 +00:00
Robin Dunn
0a67b75186 Use multi-lib build on MSW, and other tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 03:56:41 +00:00
Robin Dunn
faeb124b61 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 03:45:04 +00:00
Vadim Zeitlin
2a201ef802 fixed extraneous scrolling when scrollbars are added/removed (patch 788026; bug 746618)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 00:10:20 +00:00
Vadim Zeitlin
7b4d7f99a6 added wxRecursionGuard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 00:09:36 +00:00
Vadim Zeitlin
4ed87fa745 failed attemps to fix tons of warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 23:00:07 +00:00
Vadim Zeitlin
cd0b91571f compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:59:37 +00:00
Vadim Zeitlin
9ab5d84d04 removed an unneeded file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:58:28 +00:00
Václav Slavík
a1900c9e1d new VC++ project files with both dll and lib in one project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:43:53 +00:00
Vadim Zeitlin
c4513b2389 continue setting scrollbars even if only width/height changes, not both of them (patch 788017)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:41:31 +00:00
Vadim Zeitlin
88a036cef3 check the week day for consistency in ParseFormat() (replaces patch 788052)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:39:31 +00:00
Vadim Zeitlin
1b47bebc98 fixed unused variable (replaces patch 788090)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:33:59 +00:00
Vadim Zeitlin
8e87d1c923 removed an unused variable (patch 788101)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:31:42 +00:00
Václav Slavík
6306e927ae new VC++ project files with both dll and lib in one project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:29:46 +00:00
Václav Slavík
f2e61abefc DSP changes update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:26:26 +00:00
Mattia Barbon
f96b10c283 Refactoring: no real changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:34:21 +00:00
Mattia Barbon
4410d619c5 wxMotif STL-ification.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:28:56 +00:00
Václav Slavík
7bd54b688e 1. merged dll and lib VC++ projects into one project file, as in old projects
2. removed dependencies on 3rd party libs for static libs (doesn't work due to bug in VC++ IDE)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:22:50 +00:00
Václav Slavík
28249f1135 merged dll and lib VC++ projects into one project file, as in old projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:17:47 +00:00
Robin Dunn
5d2e69e8c0 Clear --> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 21:05:39 +00:00
Václav Slavík
2f00b79f60 use generated VC++ projects with dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 20:56:31 +00:00
David Elliott
9ba1d264f7 Improve default size. If the control is auto-fit its size won't be less
than 70 pixels.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 20:39:19 +00:00
David Elliott
d77ea20c75 Create an NSPopUpButton and size it appropriately
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 20:35:03 +00:00
David Elliott
8d656ea93c Make appropriate use of MakeDefaultNSRect and SetInitialFrameRect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 20:28:35 +00:00
Robin Dunn
771eb7a2a2 add maps for the old/new names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:47:26 +00:00
Robin Dunn
ea96591fa6 Clear --> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:46:48 +00:00
Robin Dunn
d3017584ba Add a little space so the wxHtmlCell doesn't overwrite the border of
the selection box


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:46:30 +00:00
Robin Dunn
3e13956a1f Switch to wxCHECK so the bad code isn't still executed if the assert
dialog is ignored.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:45:53 +00:00
Robin Dunn
e71fd398b8 Clear --> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:38:24 +00:00
David Elliott
d139c3a84b Added helper functions for setting initial window size:
* inline MakeDefaultNSRect makes an NSRect with position (10.0,10.0) and
  size based on the size passed to Create run through (Width|Height)Default
  This NSRect is to be used with the initWithFrame: initializer.
* SetInitialFrameRect is called after the window has been added to its parent
  and (if applicable) sized to fit.  If -1 is specified for a dimension then
  the fit/default size is kept.  If not, the window is sized to the specified
  size. It will be positioned in wxWindows coordinates (0,0==TL).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 19:37:45 +00:00
Stefan Csomor
6056c7c6f3 collection macro also for XTI_TEMPLATE_FIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 17:56:14 +00:00
Stefan Csomor
ab6e491366 collection support for XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 16:59:46 +00:00
Stefan Csomor
8143581bdc make this along the vc 7.1 exception as beforestd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 16:57:47 +00:00
Václav Slavík
99d1772009 fixed compilation of xml.cpp: include ./expat/lib directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 16:56:26 +00:00
Vadim Zeitlin
49744b79ac compilation fix after Clear() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 16:52:46 +00:00
Vadim Zeitlin
596f1d1160 renamed wxWindow::Clear() to ClearBackground() for wxGTK as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 16:47:43 +00:00
Václav Slavík
e3ac6ee157 fixed wrong arguments to Draw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 15:48:45 +00:00
Václav Slavík
21de777f02 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 15:47:44 +00:00
David Elliott
b93d8cc460 Don't send idle events while an assertion dialog is showing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 15:25:34 +00:00
Julian Smart
5bb31e3561 Fixed some missing braces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 14:38:32 +00:00
Václav Slavík
2c6f14e1a7 define NO_GCC_PRAGMA in wx-config output on Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 14:25:10 +00:00
Vadim Zeitlin
5da0803c15 renamed wxWindow::Clear() to ClearBackground() (fixes bug 783576)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 14:09:45 +00:00
Václav Slavík
339963e0d0 forgot to copy data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 13:04:27 +00:00
Václav Slavík
efefa4f800 don't forget to build all projects in the workspace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:56:44 +00:00
Václav Slavík
9ee31070a4 forgot to copy data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:39:19 +00:00
Václav Slavík
ab892b9519 makefiles update with OSX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:38:44 +00:00
Václav Slavík
8bcf2d204f fixed wxUSE_XML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:22:59 +00:00
Vadim Zeitlin
7e34b934ce made the example Unicode-friendly (patch 785642)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:16:50 +00:00
Vadim Zeitlin
9bf58645bf update by Paco Riviere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 11:31:24 +00:00
Vadim Zeitlin
4f6e963caf suppress warnings about not being able to inline a function under BC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 10:09:09 +00:00
Vadim Zeitlin
fba61bdfb7 OnExit() is not called if OnInit() failed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 10:06:32 +00:00
Vadim Zeitlin
8b3a401696 set LVCFMT_IMAGE, this at least allows to show imageso n the right sidei n the first column too (and fixes bug 787781); corrected return value of InsertColumn()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 09:58:52 +00:00
Jouk Jansen
f3858bf561 Committing in .
Updating/repairing OpenVMS compile support

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/gtk/app.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 08:48:47 +00:00
Julian Smart
8a556bae6f Minor updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 22:03:58 +00:00
Václav Slavík
fc65e0b77e disable more borland warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 22:02:55 +00:00
Václav Slavík
e06468e89b precompiled headers check accounts for Apple compiler now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 21:42:18 +00:00
Václav Slavík
4fd0fc66a7 fix static wxnet build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 21:32:54 +00:00
Mattia Barbon
8142d70447 Added wxHashSet, with minimal tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 16:45:09 +00:00
Julian Smart
2ce79e485d Removed some obsolete distribution files
Updated listing files
Added new shell scripts for spinning wxMSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 15:33:14 +00:00
Stefan Csomor
42800de660 panther fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 11:47:23 +00:00
David Elliott
4328a6ba2a Implement Raise()/Lower() using [NSVIew sortSubviewsUsingFunction:context:]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 04:30:50 +00:00
David Elliott
a82b814137 Laid groundwork for scrolling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-12 02:58:04 +00:00
Mattia Barbon
72eef31646 Expose GetCount when wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 16:48:07 +00:00
Julian Smart
e28c2d151b wxCaretSuspender only shows the caret if it was visible previously
Improved caret handling in wxTextCtrl
Restored scrollbar painting in wxUniv


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 16:33:56 +00:00
David Elliott
f07c570112 Replaced id with winid so it doesn't conflict with the Objective-C type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 15:14:37 +00:00
David Elliott
25a4727e95 Added dummy resources for wxCocoa so bundles will build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 14:53:42 +00:00
David Elliott
2d6c4e485c Added default implementation for drawRect and mouse events that returns
false so normal processing will take place.  Some users of wxCocoaNSView
may not wish to implement every event.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 13:47:50 +00:00
Julian Smart
4fa818f673 Removed some experimental code I left in by accident
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 12:49:15 +00:00
Julian Smart
4b3163294c More fixes for !wxUSE_TIMER, !wxUSE_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 12:47:16 +00:00
Julian Smart
7da6ab6e2e Cater for wxUSE_IMAGE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 10:59:07 +00:00
Julian Smart
cfb5756157 Cater for wxUSE_IMAGE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 10:46:35 +00:00
Stefan Csomor
2d51f067b9 added wxDynamicObject (kind of delegate, docs to come once this has calmed down)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 10:01:02 +00:00
Vadim Zeitlin
395470d965 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:22:51 +00:00
Vadim Zeitlin
51485b7601 fixed some warnings about unused variables values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:22:21 +00:00
Vadim Zeitlin
429ef4bcea really fixed '-' and '+' drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:15:12 +00:00
Vadim Zeitlin
be5b2f9f38 initialize the font fields properly when it corresponds to a native font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:14:34 +00:00
Vadim Zeitlin
0e7761fade trying to fix the generic tree appearance problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 00:38:32 +00:00
Vadim Zeitlin
bc51e42e8b more wxRendererNative docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 00:33:11 +00:00
Vadim Zeitlin
908db3ae8a fixed broken link
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 23:54:34 +00:00
Václav Slavík
f98da3fb82 added tex2rtf makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 22:12:22 +00:00
Václav Slavík
2ace007846 added HelpGen makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 22:11:12 +00:00
Václav Slavík
425c0d76be MacOS X bundles support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 21:21:23 +00:00
Václav Slavík
c7346341eb added tex2rtf bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 19:14:03 +00:00
Václav Slavík
f3f7aa2cb6 utilsexc.cpp is wxBase only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 19:08:38 +00:00
Václav Slavík
1ccb4e5b1d better fix for macos resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 19:06:14 +00:00
Václav Slavík
4603a6324a hopefully better fix for mac resource problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 18:50:07 +00:00
Václav Slavík
36c9f14147 quick fix for mac resource problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 18:32:44 +00:00
Václav Slavík
ef76cf4c65 __WXMAC__, not __MAC__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 18:19:11 +00:00
Vadim Zeitlin
659b3e8b81 compilation fix for !wxUSE_BASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 17:26:46 +00:00
Vadim Zeitlin
194142ed6f compilation fix for !USE_PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 17:25:36 +00:00
Václav Slavík
5025baa921 added HelpGen bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 17:12:00 +00:00
Václav Slavík
310ca0fc13 another update for newest bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:45:13 +00:00
Václav Slavík
c0b709154d update for newest bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:43:16 +00:00
Vadim Zeitlin
345b8952b4 fixed syntax error in case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:41:46 +00:00
Václav Slavík
ef0add05f1 use install_name_tool so that samples use uninstalled shared libs on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:38:38 +00:00
Václav Slavík
ab48b97b56 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:34:30 +00:00
Vadim Zeitlin
4bad920dbf parameters must have names in C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:22:08 +00:00
Václav Slavík
0f1bc9c21b wxMac compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:17:55 +00:00
Václav Slavík
8b509749e8 make sure utils.cpp and utilsexc.cpp are built only once in monolib buld
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 16:10:51 +00:00
Václav Slavík
14a39351b3 wxMac fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 15:58:19 +00:00
Vadim Zeitlin
04857cb707 added version checking to the renderers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 15:51:30 +00:00
Vadim Zeitlin
70a2162770 mac/utils\*.cpp should be built as part of wxMac too (not only wxBase)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 15:25:08 +00:00
Stefan Csomor
669b65b945 two fixes from Justin Bradford
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 14:20:03 +00:00
Václav Slavík
52a5a0098a don't install builtin 3rd party libs with shared version, only with static one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 11:54:20 +00:00
Václav Slavík
02a9235c00 pass options to submakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:40:49 +00:00
Václav Slavík
289919bf04 re-added info after installation and added samples target to the main makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:38:55 +00:00
Václav Slavík
78e1a4f699 don't generate install commands, not needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:37:16 +00:00
Václav Slavík
3f8f6b8fd0 don't generate install commands, not needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:31:07 +00:00
Václav Slavík
55915aca60 fixed DSP files for IPC sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:23:19 +00:00
Václav Slavík
f48eebbc62 check if we are using compatible C++ ABI when usin GCC or IntelC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 20:23:25 +00:00
Václav Slavík
6fcef5ed66 fixed command line parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 20:09:02 +00:00
Václav Slavík
d43307793f added bakefile format manifest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 19:12:42 +00:00
Stefan Neis
28a75c297c Added forgotten(?) wxMutexGuiEnter.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 17:08:01 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Václav Slavík
1202890513 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:38:21 +00:00
Václav Slavík
4584250034 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 11:52:38 +00:00
Stefan Csomor
31478355f8 define WX_XTI_TEMPLATE_FIX in case it is not yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 08:33:40 +00:00
Stefan Csomor
a315dda667 extended streaming-out for event handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 08:20:03 +00:00
Stefan Csomor
438edbc0bd added flag for broken compilers with regard to templated getters/setters resolution, so that we can test easily whether it's still needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 08:19:00 +00:00
Stefan Csomor
10da6a8fa4 exposing the dynamic event table
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 08:17:07 +00:00
Václav Slavík
3512cc1afb checked in broken makefile by mistake; fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 23:01:32 +00:00
Robin Dunn
c44090df7d fixed unused local wanring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 22:19:02 +00:00
Václav Slavík
c4836bee8b use wxUniv's wxTextCtrl in wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 22:06:16 +00:00
Robin Dunn
3628e08886 Added Python wrappers for wxRTTI for the wxVScrolledWindow,
wxVListBox, and wxHtmlListBox classes.

Removed the calls to wxClassInfo::Cleanup and Initialize.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 21:32:52 +00:00
Robin Dunn
0c8392cac2 Added wxRTTI for the new wxVScrolledWindow, wxVListBox, and
wxHtmlListBox classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 21:23:33 +00:00
Stefan Csomor
16776ad919 xti expansions, streaming code changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 20:51:55 +00:00
Stefan Csomor
aa8d7c2f9b xti expansions, streaming code changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 20:35:19 +00:00
Julian Smart
26f75f229b Use wxUniv textctrl for wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 19:41:00 +00:00
Julian Smart
47cd661014 Call base OnInternalIdle
Use wxUniv textctrl implementation in wxX11


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 19:39:16 +00:00
David Elliott
5a5797ca1f lock/unlockFocus when doing the copy in SelectObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 18:35:08 +00:00
Václav Slavík
eb8540036c use MSLU in wxBase, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 15:12:25 +00:00
David Elliott
e3d7f7703e * Since AppKit cannot draw directly on NSBitmapImageRep, copy the data
to/from an offscreen window during SelectObject
* Apply the usual flip transformations


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 14:57:04 +00:00
David Elliott
ab13160e71 * When cloning the ref data, copy the NSBitmapImageRep instead of retaining it
* Added SetNSBitmapImageRep so that wxMemoryDC can update the contents by
  replacing the entire NSBitmapImageRep.
* Added ability to create bitmaps from width/height


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 14:49:53 +00:00
Václav Slavík
4e209a2064 1) some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 13:15:16 +00:00
Václav Slavík
2265a2d51e 1) some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 12:59:30 +00:00
Václav Slavík
cbba971f2f fixed Common Headers group for VC++ definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 12:20:30 +00:00
Vadim Zeitlin
65c75abefc don't ignore start parameter in find_last_of()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 11:54:26 +00:00
Václav Slavík
416f5bc835 (re)added MSLU support to Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 11:49:35 +00:00
Václav Slavík
17dcec6308 fix for watcom resource compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 11:47:13 +00:00
Julian Smart
0872a451dc Static object -> pointer
Clean up renderer in module OnExit or we get a crash
on exit (under wxX11 at least). To-do: we need to add
priorities to wxModule so we can clean this up last.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 11:08:11 +00:00
Václav Slavík
15d93f1ebb some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 09:49:24 +00:00
Václav Slavík
7235a82e6c fixed some bugs in MSW version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 09:32:14 +00:00
Václav Slavík
c15fd9fba8 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 08:55:23 +00:00
Robin Dunn
5b87f8bf2e Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 03:57:35 +00:00
Stefan Neis
68a2e005a5 Added implementations for two cases of wxSystemSettingsNative::GetMetric to
make wxTextEntryDialog work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 23:14:32 +00:00
Václav Slavík
d179e30b0a more samples makefiles fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 23:01:52 +00:00
Václav Slavík
9a59a6671b removed old files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:55:56 +00:00
Václav Slavík
8004cb2bf6 more samples fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:39:45 +00:00
Václav Slavík
9ff1579dd2 no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:27:01 +00:00
Václav Slavík
437a646ae9 not needed now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:24:55 +00:00
Václav Slavík
39247d53dc newgrid was removed long ago
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:22:59 +00:00
Václav Slavík
8772a1a78d create samples makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:15:20 +00:00
Václav Slavík
87e7f16682 fixed wrong srcdir in contrib w/ autoconf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:05:00 +00:00
Stefan Neis
5c9ee6dd49 wxUsleep is supposed to sleep _milli_seconds, not _micro_seconds.
Got sockets working.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 21:39:40 +00:00
Stefan Neis
f53a0d3287 wxUsleep is supposed to sleep _milli_seconds, not _micro_seconds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 21:38:11 +00:00
Václav Slavík
f46f68d9f1 blind fix for watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 20:59:18 +00:00
Robin Dunn
ef121b24d5 only match the regex at the end of the string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 15:08:00 +00:00
Václav Slavík
cee65fd727 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:31:56 +00:00
Václav Slavík
07613d7c91 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:26:43 +00:00
Václav Slavík
f820e98de0 added all samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:18:33 +00:00
Václav Slavík
7fcb2c61a5 added makefile to compile all demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:14:19 +00:00
Václav Slavík
5d6ae97113 this file doesn't compile with Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:13:17 +00:00
Václav Slavík
3534e34a1b added bakefile to build all demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:11:41 +00:00
Václav Slavík
b3c9bdc978 use hand-written samples/Makefile.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 13:10:04 +00:00
Václav Slavík
f2f7877dbb exclude some files from being generate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 12:38:20 +00:00
Václav Slavík
0f009657bd fixed wxBase and GUI separation for sockets code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 12:35:39 +00:00
Václav Slavík
38bb138f09 fixed wxBase and GUI separation for sockets code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 12:26:17 +00:00
Václav Slavík
698ec18272 disable Borland C++ warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 12:21:50 +00:00
Václav Slavík
e840094063 consistency fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 12:02:20 +00:00
Václav Slavík
174f7a2ee2 samples/render works on Unix now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 08:34:28 +00:00
Václav Slavík
239394fb06 bakefile fix for modules linking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 08:27:27 +00:00
Václav Slavík
86c529a9d4 XP manifest is in wx.rc now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 08:16:26 +00:00
Václav Slavík
03265572de finished documentation for the new build system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 07:58:21 +00:00
Vadim Zeitlin
8fcf6e3258 fixed HasButtons()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 23:03:01 +00:00
Václav Slavík
fd9f42b6a9 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 22:44:22 +00:00
Václav Slavík
2d611b5cf2 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 22:24:06 +00:00
Václav Slavík
b53f5a2b6e more bakefile samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 21:23:54 +00:00
Václav Slavík
d3e6602e20 wxUniv -> Universal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 21:19:43 +00:00
Václav Slavík
462cc69847 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:49:41 +00:00
Václav Slavík
9c86cd10ef update for new bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:43:11 +00:00
Václav Slavík
b0540bb8ba removed OSX code that is no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:27:21 +00:00
Václav Slavík
d7ac64ee6d moved makefiles to build/msw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:19:22 +00:00
Václav Slavík
698bfad555 moved makefiles to build/msw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:09:59 +00:00
Václav Slavík
65ffe1b5b8 fixed missing <module> rule
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:08:50 +00:00
Václav Slavík
6990514b0d 1. reordered options for better VC++ projects output
2. moved makefiles to build/msw


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 20:07:48 +00:00
Vadim Zeitlin
9f2be12593 added Load() and Set() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 18:14:44 +00:00
Vadim Zeitlin
010fb35d89 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 16:54:38 +00:00
Václav Slavík
592cae95a5 added rest of contrib samples bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:58:14 +00:00
Václav Slavík
ae4ae15702 added rule for building wx plugins
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:44:00 +00:00
Václav Slavík
e54bb212fb use common resource and icon files for samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:41:49 +00:00
Václav Slavík
9c743a7c78 misc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:37:32 +00:00
Václav Slavík
fcab04720d compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:32:43 +00:00
Václav Slavík
7beac92d00 added sample.xpm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:30:56 +00:00
Robin Dunn
44934d2cf6 Patch from Will Sadkin fixing parameter order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 15:14:17 +00:00
Václav Slavík
1dd02ac0c7 added render sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 14:47:00 +00:00
David Elliott
d4675cac4e Contrary to what I had thought, the addSubview and replaceSubview:with:
messages do in fact retain the new subview properly.  This is what the
documentation clearly states, and it checks out when looking at the
retainCount.  I think I had been covering up a bug which I've since fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 14:44:18 +00:00
Václav Slavík
d07825bc2f not needed now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 14:28:01 +00:00
Václav Slavík
78556ae1e2 there can only be one makefile in a directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 14:02:47 +00:00
Václav Slavík
f73e856a8e not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 14:01:23 +00:00
Vadim Zeitlin
5f06d552ff mention wxRenderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 13:00:48 +00:00
Vadim Zeitlin
3e6c2880bf added very preliminary wxRenderer documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 12:59:59 +00:00
Vadim Zeitlin
c59e508935 added sample showing how to use custom renderers and load them from DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 12:32:14 +00:00
Vadim Zeitlin
26a7a7e1d5 added common (for all samples) .ico/.r/.rc files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 12:27:23 +00:00
Václav Slavík
485a205e78 wx-lib must work on loadable modules, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 12:15:48 +00:00
Václav Slavík
cafc76a4bb deprecated Initialize/CleanUpClasses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 12:10:30 +00:00
Václav Slavík
ab94455525 check memory leaks sooner, when wxLog target is still available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 11:33:58 +00:00
Václav Slavík
6f35ed60d3 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 10:58:01 +00:00
Václav Slavík
d1d738f18c initialize wxClassInfo::sm_classTable automatically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 10:44:48 +00:00
David Elliott
14fc7eb426 Don't install idle event handler in secondary threads.
I've not seen this happen yet, but it can, and I'm taking this precaution.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 03:42:25 +00:00
David Elliott
c818fe6634 wxCocoa: Added NSThread
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 03:40:11 +00:00
Vadim Zeitlin
68e86612e3 depends on wxAdvanced lib now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 23:06:54 +00:00
Robin Dunn
3d7a4fe81f Fixed SF Bug #781355. It was a problem with the clipping region. (By
default when drawing the ctrl characters a different drawtext method
is called than for normal text and this one didn't take care of the
clipping region correctly.)  Also fixed a couple buffer overflow
errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 22:25:38 +00:00
Stefan Csomor
f0b7eadf88 added more specializations for bcc32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 21:25:58 +00:00
Václav Slavík
e93c6860ed added opengl samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:42:41 +00:00
Václav Slavík
2512ee4ef2 added WX_CHECK_BUILD_OPTIONS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:39:51 +00:00
Václav Slavík
3579ddfe4f added opengl samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:35:09 +00:00
Václav Slavík
75fcbf8e16 updating docs to reflect build system changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:33:16 +00:00
Václav Slavík
89d96c130a no real change, removed commented out code forgotten there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:30:26 +00:00
Václav Slavík
9a5e7770ad added OpenGL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:14:00 +00:00
Václav Slavík
29f76293f5 touch wxWindows.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:12:58 +00:00
Václav Slavík
520755bbd8 build opengl samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 19:59:34 +00:00
Václav Slavík
e9e0dc1572 multilib mode is the default on unix now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 19:44:21 +00:00
Stefan Csomor
431346ff02 bcc32 needs some more specializations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 19:22:28 +00:00
Stefan Csomor
57de237383 xti change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 19:20:51 +00:00
Stefan Csomor
1bc7510adb xti change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 18:16:33 +00:00
Stefan Csomor
66c571291d borland fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 18:15:13 +00:00
Mattia Barbon
1ce0cc20cd Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:52:35 +00:00
Mattia Barbon
82c75aeab8 Unicode compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:41:14 +00:00
Stefan Csomor
066f1b7a95 xti extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:30:46 +00:00
Stefan Csomor
4521204796 xti streaming extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:25:58 +00:00
Stefan Csomor
8ec1974ea1 xti streaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:24:02 +00:00
Václav Slavík
b25757395c VC++ .NET can load DSW files just fine
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:11:25 +00:00
Stefan Csomor
fa08490f10 xti streaming cleanup, type extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 16:50:30 +00:00
Václav Slavík
8e3729ad9b added expat to wxWindows.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 16:34:49 +00:00
Václav Slavík
160ba750f2 compilation fixes for win32 dll+multilib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 16:16:49 +00:00
David Elliott
0b659b0a51 In destructor: DestroyChildren() and make sure m_cocoaNSView is NULL so that
the ~wxWindow destructor will not try to remove it from its superview (BAD!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 15:58:39 +00:00
David Elliott
29c310fe05 Removed wxTheBitmapList code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 12:54:44 +00:00
David Elliott
568cdf9c4c Initialize m_cocoaDash to NULL in copy constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 12:50:40 +00:00
Mattia Barbon
234d8e9076 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 19:55:49 +00:00
George Tasker
f157ad0815 Incorrect placement of the '*' in the line "const wxChar* WXDLLIMPEXP_ODBC". It should be "const wxChar WXDLLIMPEXP_ODBC *"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 18:56:58 +00:00
George Tasker
e7c9692f16 Added a check for a '.' in the column name before prepending a table name to the column name to avoid incorrect TABLE.COLUMN names when using a FROM clause
SF PATCH#766404 - SetColNull() was not correctly setting CbValue = SQL_NULL_DATA so that NULL columns still appeared to have data in some cases

Cleaned up some internal variable naming conventions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 18:55:01 +00:00
Vadim Zeitlin
d8692f2b80 copy wxImage options when copying the images (replaces patch 780705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 17:48:35 +00:00
Vadim Zeitlin
67b3c6576e fixes for Borland make (patch 769317)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 17:42:59 +00:00
Vadim Zeitlin
db4e73c674 update styles docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 17:04:47 +00:00
Vadim Zeitlin
1bf49fb99a don't include MDI headers if !wxUSE_MDI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 16:44:05 +00:00
Vadim Zeitlin
b442f1079f don't include unnecessary headers if we don't compile MDI at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 16:43:39 +00:00
Vadim Zeitlin
6e4db5418c fixed main source file name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 16:32:17 +00:00
Vadim Zeitlin
f46d1f6f67 fixed main source file name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 16:21:24 +00:00
Vadim Zeitlin
9d033af92e no changes, just resolved a conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 16:09:12 +00:00
David Elliott
ff793cab3a Implement new static Unload(handle) instead of old Unload()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 15:46:51 +00:00
David Elliott
13f72d6b34 Remove src/cocoa/pen.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 15:33:32 +00:00
Vadim Zeitlin
169948a05f added Unload(handle); updated the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 14:05:00 +00:00
Václav Slavík
34fdf76231 added build options sanity checks into all main libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 13:19:44 +00:00
Václav Slavík
2a7c760593 reworked wxBuildOptions code to work even w/o function inlining
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 13:17:17 +00:00
Václav Slavík
3546ffaefd fixed version number expansion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 13:13:21 +00:00
Václav Slavík
538b7569e5 static libs depend on 3rd party ones now, too (for convenience)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 12:57:59 +00:00
Vadim Zeitlin
91b34dd9e1 minor additional notes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 12:30:40 +00:00
Václav Slavík
5c802b3d9b static libs depend on 3rd party ones now, too (for convenience)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 11:59:44 +00:00
Vadim Zeitlin
0a3d26b81f (Open Watcom but not only) compilation warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 11:18:02 +00:00
Vadim Zeitlin
799b5ec965 check that wxUSE_DISPLAY==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 11:15:56 +00:00
Vadim Zeitlin
900491787c document that DrawLine() doesn't draw the last point
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 10:14:52 +00:00
Václav Slavík
517fb87124 no tabs please\!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 08:39:41 +00:00
David Elliott
0a0d1a617d wxCocoa: Added pen.mm, removed pen.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 06:24:32 +00:00
David Elliott
5eb5a0ac96 Use wxPen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 06:19:30 +00:00
David Elliott
1f631557e0 Added dash support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 06:16:15 +00:00
David Elliott
8e51701313 wxPen implementation (no dash support yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 03:10:23 +00:00
Vadim Zeitlin
9c13e5ef23 fixed non GUI cmd line options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 02:00:02 +00:00
Vadim Zeitlin
e33f650382 compilation fix after warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 01:17:33 +00:00
Vadim Zeitlin
66b6b57c0e compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 01:05:50 +00:00
Vadim Zeitlin
199fbd7093 generate a text event even if SetValue() didn't really chaneg anything
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:58:05 +00:00
Vadim Zeitlin
b832916db7 PRINTING is not dependent on DOCVIEW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:30:54 +00:00
Vadim Zeitlin
00466512a8 use wrapwin.h instead of windows.h + winundef.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:30:35 +00:00
Vadim Zeitlin
da0b5338fe set event object correctly for the menu events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:26:11 +00:00
Vadim Zeitlin
b1e88286a2 just tidied up the comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:12:00 +00:00
Vadim Zeitlin
1b8865e92c don't draw buttons unless we have wxTR_HAS_BUTTONS style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:04:37 +00:00
Vadim Zeitlin
9bd419070f check that we use bitmaps of correct size in the image list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:57:19 +00:00
Vadim Zeitlin
77bf4cefcd initialize the image list size in default ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:53:55 +00:00
Vadim Zeitlin
22c316d6ef WXWIN_COMPATIBILITY_2_2 should be 0 by default now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:44:16 +00:00
Václav Slavík
3dcc72214a removed old VC++ projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:37:53 +00:00
Vadim Zeitlin
17ff4e8fd4 fixed release mode warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:26:00 +00:00
Vadim Zeitlin
34dceb4715 fixed warning in non-DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:25:34 +00:00
Vadim Zeitlin
80c54c3d5a restored custom drawing (was accidentally disabled by the last 2 commits)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 22:23:53 +00:00
Václav Slavík
e767cedf4e added wrapcctl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:48:27 +00:00
Václav Slavík
29a57ffb58 use wxDbGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:27:40 +00:00
Václav Slavík
bb44a72b84 added wrapcctl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:27:25 +00:00
Václav Slavík
f290174451 use wxDbGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:19:21 +00:00
Václav Slavík
cadffe1b73 linking fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:00:58 +00:00
Vadim Zeitlin
b913d3ed6e moved wxUniv-specific GUI stuff from wxBase to wxCore; this fixes wxUniv DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 21:00:52 +00:00
Vadim Zeitlin
61fef19b85 warnings (and some errors) fixes for wxUniv DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:58:56 +00:00
Vadim Zeitlin
05e3a383e0 moved some more stuff from .cpp files to here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:56:30 +00:00
Vadim Zeitlin
ed0769cdab removed _WIN_IE from here, we normally shouldn't need it as it was moved to wrapcctl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:56:08 +00:00
Václav Slavík
452935628a added wxDbGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:48:09 +00:00
Václav Slavík
e2d1c5675c more bakefile-based contrib makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:45:31 +00:00
Václav Slavík
e80ae20020 more bakefile-based makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:34:31 +00:00
Václav Slavík
83b9886f17 added wxDbGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:26:51 +00:00
Václav Slavík
2e903934d1 more bakefile-based makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:24:38 +00:00
Václav Slavík
7847232620 make it possible to override directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:21:15 +00:00
Mattia Barbon
aeec2045cf Warning fixes (still does not compile).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:14:09 +00:00
Mattia Barbon
b96f9d1928 Use Unix display for Motif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:12:57 +00:00
Mattia Barbon
840015f0e3 Fix "Statement with no effect" warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:11:52 +00:00
Mattia Barbon
f9788a11c4 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:10:52 +00:00
Mattia Barbon
185448a864 Fix some wrong code: add parentheses to correct precedence,
fix comment and _WIN32_IE value (author was probably thinking about
_WIN32_WINNT. Now CVS compiles again with MinGW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:09:41 +00:00
Mattia Barbon
6d31cf4000 Improve wxHashMap documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:05:27 +00:00
Vadim Zeitlin
4b9d8a9c22 missing or wrong DLLEXPORTs for DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:03:59 +00:00
Václav Slavík
3d1f191965 reverted two last changes; they both broke compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 19:30:30 +00:00
Václav Slavík
38d85c646d fixed mmedia contrib to work if libesd is not present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:53:42 +00:00
Václav Slavík
264af224d8 bakefilized demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:47:32 +00:00
Václav Slavík
0c5852cb0e updates to reflect fixes to wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:45:17 +00:00
Václav Slavík
03206f17a6 moved FL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:29:53 +00:00
Václav Slavík
292eaa39a4 moved FL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:19:29 +00:00
Václav Slavík
3b9bf29a74 moved FL samples into single directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 18:09:38 +00:00
Václav Slavík
61d457caae compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 17:14:39 +00:00
Václav Slavík
15e8daecf5 ported rest of contrib to bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 17:11:53 +00:00
Václav Slavík
1dbdb45df5 added ability to generate wx24-like wxWindows.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 16:35:41 +00:00
Václav Slavík
edd891e220 fix the situation when one of sublibraries is not built
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 15:09:17 +00:00
Václav Slavík
0154f61aa8 fix for broken --inplace, --prefix and --exec-prefix handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 14:51:55 +00:00
Václav Slavík
7269d29bde fixed wrong target names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 13:41:28 +00:00
Václav Slavík
c580f45efe ODBC update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 13:04:02 +00:00
Vadim Zeitlin
0d236fd0fa added wrapper for <commctrl.h> as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 10:57:51 +00:00
Václav Slavík
fd68cfdbfb added WX_DECLARE_OBJARRAY_WITH_DECL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 10:42:22 +00:00
David Elliott
1580951310 Added wxGUIAppTraits::GetToolkitInfo (ok?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 04:29:53 +00:00
David Elliott
2a1d0b8ebc Removed wxGUIAppTraits::GetOSVersion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 04:06:09 +00:00
David Elliott
e22958052d Removed wxTheApp = this from wxApp constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 04:05:14 +00:00
Vadim Zeitlin
5b59df8315 avoid using _WIN32_IE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 23:26:30 +00:00
Vadim Zeitlin
0ed48c11ca s/ID_SEPARATOR/wx&/ (fixes 782133)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 23:23:44 +00:00
Vadim Zeitlin
28f9eac4b9 fixed wrong border/sash widths (typo during last commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 22:58:30 +00:00
Vadim Zeitlin
350fffae72 minor changes to eliminate unused parameter warning + some cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 22:47:40 +00:00
Vadim Zeitlin
13e51f3a55 removed extra commas which are erros for some compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 22:42:52 +00:00
Václav Slavík
9e00598cad compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 22:37:49 +00:00
Václav Slavík
bb41dcbe3a moved DB classes into wxODBC library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 19:14:54 +00:00
Václav Slavík
fd938b1177 Intel C++ needs time.h before sys/stat.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 19:11:35 +00:00
Václav Slavík
190869b2f5 compilation fix for gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 16:27:21 +00:00
Václav Slavík
c31c4e162e compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 16:21:52 +00:00
Václav Slavík
03aa88aba7 wxUSE_NEW_GRID is no longer used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 16:16:33 +00:00
Václav Slavík
45c1de352d renamed to WX_DECLARE_LIST_WITH_DECL for consistency if wxUSE_STL=0, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 15:54:07 +00:00
Václav Slavík
dea7a9ebf0 added libraries dependency graph
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 15:47:42 +00:00
Václav Slavík
f794be6afe renamed to WX_DECLARE_LIST_WITH_DECL for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 15:46:44 +00:00
Václav Slavík
324899f6c5 return wxToolkitInfo by reference and not by pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 15:39:26 +00:00
Václav Slavík
a8eaaeb237 replaced wxAppTraits::GetOSVersion with GetToolkitInfo with richer information that is needed by wxDynamicLibrary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 15:14:17 +00:00
Václav Slavík
25c0717a43 moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 14:34:42 +00:00
Václav Slavík
f213157445 corrected examples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 14:08:34 +00:00
Václav Slavík
77c6966e11 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 14:01:22 +00:00
Václav Slavík
131f235d04 moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:52:31 +00:00
Václav Slavík
57bfe3be85 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:51:28 +00:00
Václav Slavík
85f582bda7 wxJoystick and wxWave are now available in all Unix ports, the code was not GTK specific
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:50:49 +00:00
Václav Slavík
86cbbe9424 link against wxAdv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:42:10 +00:00
Václav Slavík
0a2f5c7bc5 quick compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:20:29 +00:00
Václav Slavík
8695c06a6a moved wxJoystick, wxWave and wxTaskBarIcon to wxAdv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 12:45:40 +00:00
Václav Slavík
e588dd6b1a on Linux, not GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 12:43:50 +00:00
Václav Slavík
2e27d47fa7 removed old DSPs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 12:19:33 +00:00
Václav Slavík
1384636de0 compilation fix for bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 10:53:03 +00:00
Václav Slavík
b3062afd70 compilation fix for bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 10:47:58 +00:00
Václav Slavík
4dc844c9ed don't define NDEBUG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 09:21:48 +00:00
Václav Slavík
7257b4e563 forgot to update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 09:21:17 +00:00
Václav Slavík
f53ce3a89f fixed some VC++ projects bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 01:18:15 +00:00
Václav Slavík
9818fdf902 added wxAdvanced
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 01:14:10 +00:00
Václav Slavík
13cb46e0b6 1. added wxAdvanced
2. fixed setup.h creation in VC++ projects
3. temporarily disable GUI sockets code in non-msw ports so that they link


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 01:07:39 +00:00
Václav Slavík
12f190b09c created wxAdvanced library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 01:04:55 +00:00
Vadim Zeitlin
1b7031bc01 msw/uxtheme.cpp is low level as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:38:44 +00:00
Vadim Zeitlin
2479d149ee native renderers are low level; renamed univ/renderer.cpp to ctrlrend.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:32:59 +00:00
Vadim Zeitlin
cfeafba132 renamed renderer.cpp to ctrlrend.cpp to avoid conflicts with the native renderers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:31:52 +00:00
Vadim Zeitlin
567be18754 wxUniv compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:16:06 +00:00
Vadim Zeitlin
fbaf7d1421 replaced an #ifdef __WXDEBUG__ with a wxCHECK (this is what we have it for...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:15:55 +00:00
Vadim Zeitlin
435bc10c9c disable printing; doesn't compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:13:31 +00:00
Vadim Zeitlin
a7bc03c94b use wxWindowBase, not wxWindow, in wxUpdateUIEvent::CanUpdate() (wxUniv compilation fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 00:12:39 +00:00
Vadim Zeitlin
26ab89ad4d wxTheApp can't be assigned to any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:40:07 +00:00
Václav Slavík
44aaf7dad8 added information about libs.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:39:59 +00:00
Vadim Zeitlin
a80e5f9e5b wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide Get/SetInstance() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:37:40 +00:00
Václav Slavík
cf01e37a49 adding wxAdvanced library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:37:27 +00:00
Vadim Zeitlin
4104ed92a5 added and documented wxDYNLIB_FUNCTION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:36:26 +00:00
Vadim Zeitlin
9fc6c21c03 do *not* redefine DLLVERSIONINFO struct here; do define _WIN32_IE to as high number as possible instead of as low as possible; use wxDynamicLibrary instead of raw FindLibrary/FreeLibrary calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:13:19 +00:00
Vadim Zeitlin
3afc693f07 removed IsAppThemedEx()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:02:23 +00:00
Vadim Zeitlin
7cafd224fe replaced the old wxApp with wxAppConsole::ms_appInstance of type wxAppConsole; wxTheApp is now a macro for backwards compatibility (this fixes problems with contradictorary wxTheApp definitions in separate build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:00:16 +00:00
Vadim Zeitlin
07e9078279 check for comctl32.dll version in wxUxThemeEngine::Initialize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 22:04:46 +00:00
Václav Slavík
397cfa3ae9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 21:22:01 +00:00
Václav Slavík
0425151023 multilib mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 21:21:07 +00:00
Václav Slavík
1d39da4b22 LIB instead of Static, better aligned
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 21:15:57 +00:00
Václav Slavík
1948bb3274 removed duplicated code from dynlib.h and dynload.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 21:12:40 +00:00
Vadim Zeitlin
87baeeaff6 Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 21:08:38 +00:00
Václav Slavík
1eae284d4f added VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:42:50 +00:00
Václav Slavík
91381a72f9 added VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:28:50 +00:00
Václav Slavík
67757ff749 regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:27:51 +00:00
Václav Slavík
5eddd67bed added VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:19:48 +00:00
Václav Slavík
44a8c4cf60 wxUSE_GUI=0 not needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:18:51 +00:00
Václav Slavík
f7d03d2b66 for nicer Makefile.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:15:54 +00:00
Václav Slavík
8a7fd2e3ed overview of multilib libraries added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 19:14:26 +00:00
Václav Slavík
25a7343959 regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 18:59:37 +00:00
Václav Slavík
076f10e054 regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 18:17:11 +00:00
Václav Slavík
7f79974420 XML code needs wchar_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 17:10:45 +00:00
Václav Slavík
8a74debea8 removed Mingw32-gcc295.patches ; it is obsolete for a long time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 16:49:04 +00:00
Václav Slavík
076fdb2182 preparation for runtime loading of plugins
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 16:35:57 +00:00
Václav Slavík
3f55f5b81f regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 16:05:28 +00:00
Václav Slavík
e4f21fece2 fixed weird error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 15:38:36 +00:00
Václav Slavík
f631bab9f8 added VC++ projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 15:23:44 +00:00
Václav Slavík
76791f0616 link against wxXml
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 15:11:31 +00:00
Václav Slavík
6c67131a07 --enable-debug_flag and --enable-debug_info work again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 15:03:33 +00:00
Julian Smart
8aa528db54 Don't draw full-width sash if not drawing 3D border, or we'll
get droppings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 14:46:21 +00:00
Julian Smart
3255bce320 Only draw borders if wxSP_3DBORDER specified, as before
Added IsAppThemedEx which _really_ tells you if the app is
themed, and used it in wxRendererNative::GetDefault()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 14:12:55 +00:00
Václav Slavík
d7dd1f1bc8 added DEBUG_FLAG, DEBUG_INFO and DEBUG_RUNTIME_LIBS options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:59:09 +00:00
Vadim Zeitlin
c4e6c15eeb fixed XP renderer after base class changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:50:22 +00:00
Vadim Zeitlin
2c0e6de189 added missing arguments in wxDelegateRenderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:49:33 +00:00
Vadim Zeitlin
b52401b287 documented OnDrawBackground()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:39:06 +00:00
Vadim Zeitlin
af99040c70 1. added flags to splitter drawing functions and replaced
GetSplitterBorderAndSash() with GetSplitterParams()
2. added support for "hot tracking" to wxSplitterWindow
3. added GTK2 support for the splitter to GTK renderer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:38:43 +00:00
Václav Slavík
4f6e1dac12 added DEBUG_FLAG, DEBUG_INFO and DEBUG_RUNTIME_LIBS options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 13:33:02 +00:00
Robin Dunn
9171d4b479 fixed --basename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 21:30:03 +00:00
Robin Dunn
3734a86630 If a wxPy[Command]Event has been cloned then we need to propogate the
Skip value from the original back to the clone after it has been
processed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 19:21:48 +00:00
Robin Dunn
8dc6dcde52 Various testing changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 19:21:05 +00:00
David Elliott
78250be361 wxCocoa: Allow wxUSE_CLIPBOARD/wxUSE_DATAOBJ
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 19:00:08 +00:00
Stefan Csomor
0c03c79e01 template<> added for some compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 17:54:11 +00:00
Stefan Csomor
dadaeb6978 Added wxASSERT_MSGs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 17:53:15 +00:00
Julian Smart
c02e5a31c5 Removed some warnings in widgets sample
Reduced some flicker in wxNotebook when using
XP controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 13:59:28 +00:00
Václav Slavík
055f8a8b28 examples of customizing VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 11:44:03 +00:00
Václav Slavík
323c4ded5d added VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 11:41:35 +00:00
Julian Smart
229de929f3 Suppressed some flicker in standard wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 11:33:39 +00:00
Julian Smart
a9d3371aec Added back the copy ctor and assignment warning suppression
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 11:31:39 +00:00
Václav Slavík
5df6736f70 reference to technote
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 11:15:26 +00:00
Václav Slavík
1bfeafbe2b fixed dsw generator on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 10:41:37 +00:00
Václav Slavík
0fbf568271 Julian forgot to add wxUSE_UXTHEME
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 10:13:33 +00:00
Václav Slavík
9c7f75734a new wxUSE_xxx variables must be in chkconf.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 10:13:03 +00:00
Václav Slavík
85b657c79d compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 10:12:33 +00:00
Václav Slavík
e8e1149bd7 make it possible to use wxConsoleApp in GUI build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 10:11:28 +00:00
Václav Slavík
b6e20cff8c finished documentation on modifying new build system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 09:53:49 +00:00
Vadim Zeitlin
ca5ccd7eeb added wxUxThemeHandle class for opening/closing theme handles easily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 00:59:37 +00:00
Vadim Zeitlin
7f9fe7891d suppress errors when loading uxtheme.dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 00:58:16 +00:00
Vadim Zeitlin
8b97949eac use XP renderer if available; implemented splitter drawing using XP functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 00:54:15 +00:00
Vadim Zeitlin
2142d7ba6a compilation fix after wxUxThemeEngine changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 23:16:48 +00:00
Vadim Zeitlin
2d9c0e97c5 [start of] cleanup uxtheme support code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 22:31:20 +00:00
Václav Slavík
82ca3afeb0 added file groups to VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 22:03:11 +00:00
Václav Slavík
069956d805 removed univ/setup.h, shouldn't be here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 22:01:52 +00:00
Vadim Zeitlin
27d0dcd033 added wxVListBox::OnDrawBackground(); fixed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 21:36:38 +00:00
Václav Slavík
6839868c86 added VC++ projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 21:30:42 +00:00
Václav Slavík
83c2f426de added rendrcmn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 21:29:26 +00:00
Václav Slavík
74e7371459 added setup.h copying to VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 21:14:38 +00:00
Gilles Depeyrot
72625d8969 updated with latest file changes and added dynamic library (dylib) targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 19:02:53 +00:00
Gilles Depeyrot
b2680b69cc updated with latest file changes and added dynamic library (dylib) targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 18:51:03 +00:00
Stefan Csomor
30fd71e65b xti fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 18:08:13 +00:00
Stefan Csomor
5c0217af06 workaround CW bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 17:57:37 +00:00
Stefan Csomor
4393b50ccd fixing xti problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 17:55:53 +00:00
Václav Slavík
b19f771f52 don't run autoconf automatically, it's problematic on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 17:14:22 +00:00
Václav Slavík
1cbb95a220 versioned symbols no longer contain toolkit name, only WX(unicode)(build)_(release)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 16:09:52 +00:00
Václav Slavík
c5be79d910 AM_PATH_WXCONFIG takes 4th argument with libs list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 15:48:55 +00:00
Vadim Zeitlin
0f159c531e warning fix (bug 714677)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 11:41:57 +00:00
Václav Slavík
3338009913 reorganized wx-config to have all configure-modified values in one part and script logic in another, so that the former can be moved to another file to allow choosing from installed wx versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 09:44:43 +00:00
Václav Slavík
67c13b6cf5 more fixes: add host_alias suffix when cross-compiling; add builtin 2rd party libs to --libs output; always include wxbase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 09:10:55 +00:00
Vadim Zeitlin
34adc95440 reverted GTK 1.x part of the last patch, it breaks popup menus sometimes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 00:15:26 +00:00
Vadim Zeitlin
e2620fdadc quick and dirty fix for strptime()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 23:40:03 +00:00
Václav Slavík
fef23dd452 fix wxBase name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 23:06:59 +00:00
Václav Slavík
a3ea8b5c09 fixed a small bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 22:53:16 +00:00
Václav Slavík
cf615ebbb1 adapted wx-config to work in multilib mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 22:42:16 +00:00
Robin Dunn
1dbd57590d SWIGged update for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 20:51:23 +00:00
Robin Dunn
62fc00206f Show how to iterate selected items in a wxListCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 20:39:19 +00:00
Robin Dunn
6921cf96a0 Regenerated embedded images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 19:26:09 +00:00
Robin Dunn
f676b38715 Don't log errors from GetScrollInfo since it is possible that there
will be an error return when there isn't actually an error (ie. when
the window doesn't have scrollbars yet.)  Left the if... statements in
place in case we want to add an assert there later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 18:53:35 +00:00
Robin Dunn
a565c7645e Allways need an App object now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 18:51:17 +00:00
Robin Dunn
e45cc23511 Two fixes for CheckTransparency. First, don't start checking from
(x+1,y) since you don't know if (x,y) is transparent or not.  Second,
use x*(numColBytes+1) instead of just x to offset into the first
line.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 18:47:38 +00:00
Julian Smart
c6151f2a94 Added wxPaintDCEx class, to handle the case where an HDC
is passed with WM_PAINT. Apps that want to can have their
own HDC painted on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 14:27:18 +00:00
David Elliott
276a125640 Added stubs for (DeviceToLogical|LogicalToDevice)(X|Y)Rel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 02:32:42 +00:00
David Elliott
cd7542bc44 Stub for wxIcon constructor taking a non-const xpm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 02:26:52 +00:00
David Elliott
cf6e135c04 Stub for wxRegion constructor taking a wxRect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 02:26:09 +00:00
David Elliott
7cc284529a IMPLEMENT_DYNAMIC_CLASS for wxSpinEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 02:22:50 +00:00
David Elliott
b9505233a5 Keep track of the captured mouse window so the base GUI code thinks the window
is captured.  Doesn't capture it, but at least satisfies the assertions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 02:20:51 +00:00
Vadim Zeitlin
6fa54bfe64 regenerated after adding rendcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 23:13:47 +00:00
Václav Slavík
1020103f16 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 21:32:46 +00:00
Stefan Csomor
70e881039b metadata streaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 20:44:57 +00:00
Stefan Csomor
51596bcb98 preliminary EXTENDED_RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 20:17:37 +00:00
Stefan Csomor
fbbdc52c5d xti updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 20:16:51 +00:00
Stefan Csomor
38759b6794 Added Setter for Position (consistency)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 20:15:59 +00:00
Vadim Zeitlin
3d3a4a25ad compilation fix for !PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 19:25:06 +00:00
Vadim Zeitlin
4a9cba9ef8 added rendcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 19:22:44 +00:00
David Elliott
374eabc1f2 wxCocoa: Added clipbrd.(mm|h) dataobj.(mm|h) dataform.h dataobj2.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 19:12:37 +00:00
David Elliott
aa3d027735 wxCocoa: Include new platform-specific headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 19:09:47 +00:00
David Elliott
977ea6b6bf Added wxClipboard and wxDataObject (and friends) declarations and stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 19:07:26 +00:00
David Elliott
4a5f4703d9 wxCocoa: added src/cocoa/fontenum.mm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 18:53:23 +00:00
David Elliott
3d7e98ed47 Added wxFontEnumerator stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 18:52:34 +00:00
David Elliott
a7166b34c8 Don't use pragma interface/implemenation for __APPLE__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 17:56:33 +00:00
David Elliott
830f7bc472 pragma interface/implementation should not be used for __APPLE__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 17:51:33 +00:00
Stefan Csomor
bf53205394 keeping classnames in synch for xti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 11:38:17 +00:00
Vadim Zeitlin
bc71a3efb7 added new renderer files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 11:01:11 +00:00
Vadim Zeitlin
f0244295e3 added wxAppTraits::CreateRenderer() which may be used to customize the renderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 10:59:42 +00:00
Václav Slavík
029b47ad2c added --enable-official-build and --enable-vendor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 09:11:32 +00:00
Václav Slavík
ef9bfb7103 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:46:15 +00:00
Stefan Csomor
06305c29bd xti introduction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:39:37 +00:00
Stefan Csomor
6d553b5fd0 wxUSE_EXTENDED_RTTI as name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:39:12 +00:00
Václav Slavík
0ca4ab85b7 ported wxSVG contrib to bakefile (patch #778614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:33:29 +00:00
Stefan Csomor
30bfc42574 wxUSE_EXTENDED_RTTI as name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:32:04 +00:00
Václav Slavík
aa1f870c84 added animate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:23:09 +00:00
Stefan Csomor
a095505c96 xti introduction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:10:54 +00:00
Stefan Csomor
9a069b7279 even more defines for rerouting the xti information to the correct members
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 08:05:34 +00:00
Václav Slavík
36be32ecdc reverted removal of \arg, \true and \false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 07:57:03 +00:00
Václav Slavík
5147a986fe added \true and \false defs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 07:52:51 +00:00
Václav Slavík
bfe1a1f11a added \arg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 07:49:03 +00:00
Julian Smart
b06ba07664 Corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 07:14:32 +00:00
Vadim Zeitlin
15cdcf6a0e load ws2_32.dll dynamically in wxGetFullHostName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-28 00:18:10 +00:00
Václav Slavík
e9877ed3a8 separated wxBase and wxNet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 23:15:47 +00:00
Václav Slavík
66a967448d separated wxBase and wxNet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 23:00:22 +00:00
Vadim Zeitlin
93fa67c0e6 GetPath() now has wxPATH_GET_COLUME by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 22:53:23 +00:00
Václav Slavík
7c4728f633 split wxBase into wxBase and wxNet libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 22:41:06 +00:00
Václav Slavík
c0421c9993 added *_WITH_DECL macros so that it is possible to export hashes from
DLLs other than wxCore


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 22:35:02 +00:00
Václav Slavík
3fe70739d2 added precomp-headers-exclude (DSP files only so far) and fixed dependencies for building wxBase part of multilib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 19:56:54 +00:00
Mattia Barbon
f7b83689c6 STL compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 19:13:19 +00:00
Václav Slavík
64d19dba31 configure changed after 3rd party libs condition changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 13:17:20 +00:00
Václav Slavík
7892b9436c compilation fix for BC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 11:16:51 +00:00
Václav Slavík
1412634be8 compilation fix for BC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 10:53:44 +00:00
Václav Slavík
aa65c84333 added helpext.cpp plus changes to bakefile towards more readable and more cvs diff friendly makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 10:33:27 +00:00
Václav Slavík
f1e6f6268e build libjpeg, libpng and libtiff only in GUI mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 09:52:41 +00:00
Václav Slavík
390c0cfb06 include headers in MSVC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 09:50:55 +00:00
Václav Slavík
22d2b5bf2f added hints to bakefile so that it knows that it must put only one file on line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 09:42:52 +00:00
Vadim Zeitlin
d16cf3cd54 implemented native GTK drawing for the splitter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 02:01:32 +00:00
Vadim Zeitlin
62dc9cb4f1 added orient parameter to DrawSplitterSash instead of using wxMirrorDC in the splitter (it is now used in generic renderer only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 02:00:55 +00:00
Vadim Zeitlin
003b8322f3 Unicode compilation fixes (patch 747793)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 23:29:27 +00:00
Václav Slavík
404d46099c sync with bakefile change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 20:45:01 +00:00
Vadim Zeitlin
c71963cdbe VC++ warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 17:34:12 +00:00
Mattia Barbon
46ec70fb5a Blind compilation fix for old Motif wxComboBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 12:26:09 +00:00
Václav Slavík
52ece50b3e added helpext.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 08:54:58 +00:00
Robin Dunn
18d95cf07f More build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 00:21:37 +00:00
Robin Dunn
3e46a8e623 Use the separate contrib libs on MSW too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 00:20:04 +00:00
Robin Dunn
408ac1b8cf MOre fixes for DLL builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-26 00:18:57 +00:00
Václav Slavík
01002a3525 added descriptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 22:04:43 +00:00
Robin Dunn
7ba1412f19 Fixes to allow STC to be built as a DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 21:24:49 +00:00
Robin Dunn
5f331691d4 Fixes to allow OGL building as a DLL
Also removed the hack I put in last week to allow building without the
deprecated headers and fixed it the right way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 21:20:57 +00:00
Mattia Barbon
d772bf4341 STL compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 21:10:26 +00:00
David Elliott
c16471b6e8 Fixed operator[] recursion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 13:56:29 +00:00
Václav Slavík
bdc408c4c6 1. use three numbers version in win32 DLLs on unstable branch
2. automatically increase major soname version with every unstable release


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 12:38:48 +00:00
Vadim Zeitlin
646c4aebb2 warning fixes (closes 767152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 12:14:08 +00:00
Vadim Zeitlin
e75f014a3c columns are in report mode, not list (bug 776081)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 12:02:37 +00:00
Václav Slavík
c0ff5d67e1 symlink fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 10:09:05 +00:00
Václav Slavík
2d34a3036e better attempts to try .utf-8 suffix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 09:40:21 +00:00
Václav Slavík
fe164c3e2e fixed wxSTC compilation with MSVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 09:06:49 +00:00
Václav Slavík
88ff7ac19a fixed pch warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 09:06:13 +00:00
Václav Slavík
0469579d3e don't use precompiled headers with wxSTC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 09:04:09 +00:00
Robin Dunn
5a2a9da2c2 build fixes and reSWIGs for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 02:32:46 +00:00
Robin Dunn
d84a9306f0 Build fixes and reSWIGs for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-25 00:34:15 +00:00
Vadim Zeitlin
90e9494a5d if IsAlwaysOnline() returns true, IsOnline() should also return true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 21:21:24 +00:00
Mattia Barbon
90b6b97467 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 20:06:02 +00:00
Mattia Barbon
e87b783352 Create a new wxStringBase class, providing a STL-like API, using
the current wxString implementation.
  Derive wxString from one of wxStringBase, std::string, std::wstring
depending on wxUSE_STL/wxUSE_UNICODE settings. wxString provides
full compatibility with the old wxString in both wxUSE_STL=0 and
wxUSE_STL=1 modes (except for [Un]getWriteBuffer).
  Add some configure checks for std::string features.
  Add tests for STL API in console sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 19:44:57 +00:00
Mattia Barbon
7918efb247 Removed workaround for a (now fixed) wxMotif problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 19:35:55 +00:00
Mattia Barbon
728c62b66d Fixed wrong wxList<T>::compatibility_iterator::GetPrevious.
Added operator== and != for compatibility_iterator.
  Removed deprecation warning of wxStringList: until wxPathList
is changed not to use wxStringList, having the warning is just
annoying.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 19:33:59 +00:00
Mattia Barbon
684d26bb27 Removed (wrong) wxHashTable::compatibility_iterator::GetPrevious
implementation: hash table iterators are forward-only.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 19:29:42 +00:00
David Elliott
ba7c420af0 Better stub for wxDisplaySize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 18:29:59 +00:00
David Elliott
abf7c2779e Added build instructions, readme, and TODO
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 13:20:59 +00:00
Julian Smart
b386cd7a8e Deal with a zero to-page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 11:32:29 +00:00
Stefan Csomor
a1a816f8cc new xml in main tree adaptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 11:10:27 +00:00
Stefan Csomor
02ac8d7a5d expat define MACOS_CLASSIC added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 10:44:41 +00:00
Stefan Csomor
214d3d5766 renderer added, expat and xml
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 10:43:43 +00:00
Julian Smart
b38b0d22d7 Fixed preview navigation as per ancient bug report
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 10:07:43 +00:00
Stefan Csomor
a0fcdd5fed mac config file for expat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 09:55:42 +00:00
Vadim Zeitlin
4c9483436c more compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 01:04:19 +00:00
Robin Dunn
7a50586140 Lots of changes for wxPython to start using many of the new featues in
wxWindows 2.5


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 00:57:49 +00:00
Vadim Zeitlin
8b58d2df62 fix some warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 00:42:29 +00:00
Robin Dunn
3ef86e32dd Lots of changes for wxPython to start using many of the new featues in
wxWindows 2.5


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-24 00:28:34 +00:00
Robin Dunn
e4a7bbfc1e Added missing header files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 23:21:19 +00:00
Julian Smart
d2b354f9c9 Printing improvements: GetPageInfo() gets called after the DC has
been set and after OnPreparePrinting() has been called so it can
report the number of pages accurately; doesn't try to set
number of pages in print dialog, in common with other Windows apps;
wxHTML easy printing's preview shows number of pages
correctly; preview scrollbars are set correctly; keyboard navigation
improved


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 20:30:19 +00:00
Mattia Barbon
3d16b99ece Remove single-argument constructor of wxHashMap::value_type.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 19:26:32 +00:00
Vadim Zeitlin
4a08283ef0 compilation fix...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 19:19:06 +00:00
Vadim Zeitlin
0e2f1b3efb attempt to fix waiting for a thread in another non-main thread
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 19:06:27 +00:00
Mattia Barbon
d8274c928e Fixed memory leaks when wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 19:06:14 +00:00
Mattia Barbon
7df07b10aa various compilation/warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 19:04:42 +00:00
Václav Slavík
2db1bd2234 module.h is not included by wxprec.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 18:04:26 +00:00
Vadim Zeitlin
e356d4693d another compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 18:03:57 +00:00
Vadim Zeitlin
5cb80ad233 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 17:19:08 +00:00
Václav Slavík
90d26317f7 wxUSE_XML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 17:13:20 +00:00
Robin Dunn
215ef7ae9a return sensible (fake) values for DBCS query methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 16:55:28 +00:00
Václav Slavík
b37023dca3 fix warning on watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 14:49:37 +00:00
Václav Slavík
6f3012ae09 including header once is enough
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 14:43:13 +00:00
Václav Slavík
9cec343c9d (blind) fix for mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 14:05:45 +00:00
Vadim Zeitlin
36308e0e02 fixed completely broken CheckForTransparency()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 12:48:11 +00:00
Vadim Zeitlin
cef338d391 fixed wxSTAY_ON_TOP for the dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 23:50:38 +00:00
Vadim Zeitlin
95155e752c failed attempts to implement native GTK look for the splitter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 23:35:20 +00:00
Vadim Zeitlin
52c14774b3 restore some of the styles; added support for splitters without border/sash to generic renderer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 22:12:32 +00:00
Vadim Zeitlin
4749467786 more warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 21:50:05 +00:00
Václav Slavík
b0251b161a fixes to setup_h rule
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 19:39:49 +00:00
Vadim Zeitlin
c37d699a03 wxAutomationObject is not VC++-only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 19:35:46 +00:00
David Elliott
2c23fe91e3 wxCocoa: Added preliminary Blit support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 17:40:52 +00:00
Julian Smart
68d31398dd Applied patch [ 774886 ] wxnotebook bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 16:47:33 +00:00
Julian Smart
16dc3e3df6 Sorted out misc/oglmisc mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 16:41:36 +00:00
Julian Smart
1dde66dda6 Applied patch [ 774837 ] OGL wxLineShape::HitTest: smaller region
Also fixed .dsp file to reflect oglmisc.cpp name
Fixed some warnings
Added test for wxUSE_PROLOGIO


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 16:15:49 +00:00
Václav Slavík
6ee3c06421 fixes to dependency problems in win32 makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 13:03:24 +00:00
David Elliott
69f2115d33 Added NSImage definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 13:02:13 +00:00
Václav Slavík
e3b8a86696 msvc compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 12:43:40 +00:00
Václav Slavík
876fa7e469 Watcom compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 12:11:35 +00:00
Václav Slavík
9416681d9d multilib mode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 11:50:40 +00:00
Václav Slavík
fa2986105a expat compilation fix for win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 11:37:40 +00:00
Václav Slavík
a6cbc4db3d compilation fixes for Vadim's changes and Borland C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 11:13:50 +00:00
Robert Roebling
3479189669 Applied pop menu patch.
Applied font util patch for better font matching under GTK 1.2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 09:01:49 +00:00
Chris Elliott
aa3d520a74 borland does not like ; at end of macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 09:01:02 +00:00
Vadim Zeitlin
c39e82f097 don't sort filenames returned from the dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 01:47:16 +00:00
Vadim Zeitlin
2eb10e2a17 more warning fixes; removed references to wxToolBarBase from wxRTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 01:42:41 +00:00
Robin Dunn
0199503bf0 Compile fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 01:10:04 +00:00
Robin Dunn
d99859e492 Patch #775355 Unicode fix for STC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 01:00:16 +00:00
Vadim Zeitlin
fc7a2a602b undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 00:24:07 +00:00
Vadim Zeitlin
cd989b24ae suppress warning about not being able to generate copy ctor/operator=()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 23:16:57 +00:00
Vadim Zeitlin
4a8cd0189f must derive from wxDC, not wxDCBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 23:13:34 +00:00
Vadim Zeitlin
cfbef359d6 added default parameters to wxBrush/wxPen ctors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 23:13:15 +00:00
Vadim Zeitlin
b3208e1158 virtualized splitter drawing; removed/deprecated some styles and moved others from wx/defs.h; eliminated flicker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 23:12:17 +00:00
Václav Slavík
f65a69e9a0 expand wildcards on windows (patch #773160)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 22:23:09 +00:00
Václav Slavík
5f0b6dff53 detect broken expat.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 22:18:06 +00:00
Václav Slavík
8a7b058372 install resource files with wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 21:53:58 +00:00
David Elliott
fc1852c1af dcmemory.cpp is now dcmemory.mm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:57:32 +00:00
David Elliott
28f3fe51bd wxCocoa: Preliminary wxMemoryDC implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:55:50 +00:00
Vadim Zeitlin
559b61bf8c gave default parameters for wxBrush() ctor from wxColour (this is what is used in 99 of cases...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:48:08 +00:00
Vadim Zeitlin
5b36366c59 gave default parameters for wxBrush() ctor from wxColour (this is what is used in 99 of cases...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:41:48 +00:00
Mattia Barbon
ac32ba44a1 wxX11 and wxMotif STL-ification, part 1. it does not compile.
yet, but keeps the diff between my local copy and HEAD < 4000
lines...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:00:38 +00:00
Mattia Barbon
a381fd1c0a Compilation fixes for wxUSE_STL=1 and for
WXWIN_COMPATIBILITY_2_4=0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 19:55:46 +00:00
Vadim Zeitlin
4f53523161 gave default parameters for wxPen() ctor from wxColour (this is what is used in 99 of cases...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 19:39:34 +00:00
Vadim Zeitlin
8f20ea0391 added wxMirrorDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 19:15:17 +00:00
Václav Slavík
40633ceee3 fixed inclusion of expat include dir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 18:58:58 +00:00
David Elliott
aeb500e64c Don't depend on wx/dcmemory.h to include wx/dcclient.h for wxPaintDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 18:57:04 +00:00
Václav Slavík
e3b108b80c fixed inclusion of expat include dir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 18:45:53 +00:00
Václav Slavík
ed86d880f1 applied Mandrake patch to expat, fixes compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 18:33:53 +00:00
David Elliott
fe8f794343 Implemented wxDC stack with focus locking and unlocking
Implemented wxClientDC


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 17:06:02 +00:00
David Elliott
d118e323d5 Remove CR at end of each line (had been checked in as DOS on UNIX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 15:52:02 +00:00
Vadim Zeitlin
a0fad72341 compilation fix for VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 13:04:58 +00:00
Vadim Zeitlin
c89d41600b only define operator bool() if operator long() is not defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 13:03:33 +00:00
Vadim Zeitlin
aedd6d6aca no real changes; just reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 12:30:47 +00:00
Vadim Zeitlin
4104d2b331 initialize ICONINFO to avoid Purify warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 12:30:30 +00:00
Vadim Zeitlin
3ebcd89da9 bitmaps of size 0 shouldn't be valid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 12:28:48 +00:00
Vadim Zeitlin
6f12c2c955 load any files, not only XPMs, in wxIcon(wxIconLocation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 12:21:22 +00:00
Vadim Zeitlin
4340bf8cb0 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 11:58:53 +00:00
Mattia Barbon
b5435dccd0 Compilaton fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 10:01:56 +00:00
Mattia Barbon
de564874d6 Use wxStringBuffer[Length] instead of explicit calls to
wxString::get/UngetWriteBuffer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 09:41:26 +00:00
Vadim Zeitlin
11d395f9d7 icon location may contain , so added GetIcon() overload taking MessageParameters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 01:13:18 +00:00
David Elliott
1fd1788091 Added bitmap drawing support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 00:29:04 +00:00
David Elliott
d135b1a5f7 wxCocoa: Added preliminary wxBitmap support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 00:27:32 +00:00
David Elliott
4c7020e9f5 Remove wxBitmapHandler code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 00:08:47 +00:00
David Elliott
a4d592ff8d wxCursorRefData inherits from wxObjectRefData instead of wxBitmapRefData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 00:07:58 +00:00
David Elliott
c10ec9f5b2 Added NSBitmapImageRep
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 00:05:16 +00:00
Julian Smart
12617ca53c Added a resource for Smartphone menubar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:59:09 +00:00
Julian Smart
1896f99ca4 Quit item = wxID_EXIT in case we use standard ids in resources
Minimal sample frame style suits Smartphone and Pocket PC now


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:58:05 +00:00
Julian Smart
beb471b5e9 No significant change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:56:10 +00:00
Julian Smart
74d0b78c36 Load Smartphone-specific dummy menu
Unfortunately you can't change it, yet


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:54:34 +00:00
Václav Slavík
489c64e0e1 fixes for win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:43:31 +00:00
Václav Slavík
cecc483e14 XML library moved to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:15:32 +00:00
Václav Slavík
a90d7e684a moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:12:55 +00:00
Václav Slavík
9ed8bee9e1 removed old expat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:06:35 +00:00
Václav Slavík
34c6bbeeac moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:04:57 +00:00
Václav Slavík
a69544bf4d added expat and XML libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:00:40 +00:00
Václav Slavík
9fae71ed16 added contrib makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 21:55:50 +00:00
Václav Slavík
672abd7a83 moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 21:50:39 +00:00
Václav Slavík
27b0c28644 moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 21:37:03 +00:00
Vadim Zeitlin
836543b810 fix for bug introduced in GetNextChild() yesterday
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:52:32 +00:00
Vadim Zeitlin
07f20d9a63 added sizers support; allow resizeable wizards (Robert Vazan)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:48:52 +00:00
Václav Slavík
e066bd132d compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:39:35 +00:00
Vadim Zeitlin
3dd570e572 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:22:26 +00:00
Vadim Zeitlin
5b087ae258 added wxSize::IncTo/DecTo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:04:22 +00:00
Václav Slavík
9a0b7e3319 (incomplete) compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:03:29 +00:00
Vadim Zeitlin
f93647859c added \arg macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 20:02:56 +00:00
Václav Slavík
2bcd40a342 removed old makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:37:35 +00:00
Mattia Barbon
98fc1d65f9 Always initialize variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:33:56 +00:00
Mattia Barbon
b5f6b52ab3 Compilation fix for !WXWIN_COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:32:44 +00:00
Mattia Barbon
ccd7d9e5eb wxUSE_STL=1 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:29:30 +00:00
Mattia Barbon
2b2264e960 Bakefile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:28:36 +00:00
Mattia Barbon
a9711a4deb Compilation fixes for !WXWIN_COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 19:27:14 +00:00
Vadim Zeitlin
e8448b790f '-' and '+' icons were reversed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:59:36 +00:00
Vadim Zeitlin
9d99961992 more compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:54:10 +00:00
Václav Slavík
daa66792aa added library target to regen only lib makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:47:55 +00:00
Vadim Zeitlin
4dc5502753 fixed suppressing of wxFontMapper questions which was broken by GUI/base separation changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:40:24 +00:00
Vadim Zeitlin
38c4cb6aa7 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:29:21 +00:00
Vadim Zeitlin
cea4cc7942 added renderer.h/.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:09:21 +00:00
Vadim Zeitlin
c5e0a5f05d rebaked after adding renderer.h/.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 18:08:13 +00:00
Vadim Zeitlin
9c7f49f569 added wxRendererNative to be used by the generic controls for rendering platfomr-specific parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 17:52:26 +00:00
Václav Slavík
f509d00d20 fixed /Mxx flag when using static RTL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 17:37:15 +00:00
Vadim Zeitlin
81ba2662b1 fixed loading of icons from MIME types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 17:21:15 +00:00
Václav Slavík
d9963bbb21 files.lst files are no longer used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 16:38:30 +00:00
Václav Slavík
5e9f252451 Initial revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 16:22:55 +00:00
Vadim Zeitlin
a8e25474e4 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 14:05:48 +00:00
Vadim Zeitlin
2d75caaa6d fixes for deprecated warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 14:01:00 +00:00
Václav Slavík
284fa852b4 fixed import lib creation with gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 12:20:25 +00:00
Václav Slavík
7fb357a795 test undividable words
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 12:13:52 +00:00
Vadim Zeitlin
82fee08622 prevent IsDialogMessage() from hanging in yet another case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 11:56:39 +00:00
Vadim Zeitlin
8fa3a431af reverted gdk_fontset_load() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 11:53:37 +00:00
Vadim Zeitlin
1772d20c87 don't disable MDI for Cocoa finally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 01:25:56 +00:00
Vadim Zeitlin
4dd03db976 another attempt to open files via DDE corrctly: try Request() first, *then* Execute()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 00:35:49 +00:00
Robin Dunn
250700e4ac A new set of baked makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 00:06:37 +00:00
Vadim Zeitlin
df3b589875 mention wxTreeItemId change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 23:13:30 +00:00
Vadim Zeitlin
f888d61444 made wx[Array]TreeItemId[s] more backwards compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 23:12:33 +00:00
Mattia Barbon
69b9f4cca4 wxUSE_STL=1 compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:42:12 +00:00
Mattia Barbon
ee6eb8d8ca Fix use of deprecated wxList/Node methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:10:19 +00:00
Mattia Barbon
1807c27dbc Don't #include Motif headers from src/x11/glcanvas.cpp.
prepare for using src/x11/glcanvas.cpp for wxMotif.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:07:15 +00:00
Mattia Barbon
9b51403d37 Remove commented-out code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:04:23 +00:00
Mattia Barbon
2da2f941bb Fix wx[Sorted]ArrayString::Index when wxUSE_STL=1, because
it is different than wxArray::Index (second argument is for
case sensitivity, not search direction).
  Use forward declaration for wx[Sorted]ArrayString, where
possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:01:14 +00:00
Vadim Zeitlin
2f7b6734e4 GetFirst/NextChild() now use wxTreeItemIdValue instead of long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:40:33 +00:00
Vadim Zeitlin
5e2ab1ea5d reverted the last change (colour values changes), it cerated too many problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:36:28 +00:00
Vadim Zeitlin
d33f1a1a9a warning 4284 doesn't have to be suppressed any more for VC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:22:41 +00:00
Vadim Zeitlin
b92203a8be moved smart phone test to chkconf.h from features.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:11:47 +00:00
Vadim Zeitlin
ee4b272189 replaced untyped hash with a typed one; 64 bit fixes (don't cast pointers to long...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:06:59 +00:00
Vadim Zeitlin
46674ada08 reduced compilation dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:01:58 +00:00
Václav Slavík
75d3838010 must convert filename to URL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 20:27:17 +00:00
Vadim Zeitlin
137b730319 compatibiltiy functions should be inline, we don't want to take space hit for using them nor speed hit for the user code!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 19:56:46 +00:00
Vadim Zeitlin
6de4403884 define a special PTR version of LIST macros which should be used if you want operator->()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 19:52:00 +00:00
Vadim Zeitlin
6108e3fd32 added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 19:46:29 +00:00
Vadim Zeitlin
282e8e0c10 don't disable warnings for VC7, not necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 19:16:15 +00:00
Vadim Zeitlin
e3a6a6b2bc added Show/HideNativeCaret() (patch 759924)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 19:01:27 +00:00
Vadim Zeitlin
974931fefa don't set focus to radiobox in SetSelection() (patch 759456)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 18:52:29 +00:00
Julian Smart
449110cd74 Added minimal file dialog for SmartPhone
Use wxSYSTEM_MENU to get X symbol on PocketPC


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 17:46:33 +00:00
Vadim Zeitlin
f74172ab42 extracted common code into a single wxfileDialogBase class (patch 758901)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 17:22:05 +00:00
Vadim Zeitlin
f363e05c6d added GetForbiddenChars() and TRUE -> true (patch 757777)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 17:06:29 +00:00
Václav Slavík
57700c5097 more sorting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 16:47:15 +00:00
Václav Slavík
e83a52a25a fixed wrong order of libraries for contrib samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 16:26:36 +00:00
Václav Slavík
d1fafa4ea9 fix resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 16:06:37 +00:00
Mattia Barbon
9539ad0b79 Some bakefile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 15:14:34 +00:00
Mattia Barbon
4c3ebca927 Fix some compilation and linking errors in samples.
Replace some calls to wxString::getWriteBuffer with
wxStringBuffer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 15:05:08 +00:00
Mattia Barbon
77c35b7185 Added bakefiles for cube OpenGL sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 15:01:55 +00:00
Vadim Zeitlin
96f32e187b undecorate C++ names if possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 14:15:56 +00:00
Vadim Zeitlin
261a714b67 added medium orange/gold corresponding to the old (2.4) values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 12:21:17 +00:00
Vadim Zeitlin
1b69aa4baf mention colour change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 12:17:17 +00:00
Václav Slavík
936a13b501 gizmos fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 12:03:47 +00:00
Julian Smart
29e499cfc2 Added files so sample links
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 12:00:54 +00:00
Václav Slavík
62958ed73f USE_OPENGL is 0 by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 10:45:15 +00:00
Václav Slavík
a3aa294d4c don't build _gl by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 10:24:50 +00:00
Vadim Zeitlin
3879ecda7c disable sockets and MDI for Cocoa; do more consistency checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 00:24:16 +00:00
Mattia Barbon
fe5fc682a2 Fix wxStringBuffer for wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 20:31:59 +00:00
Mattia Barbon
941b78cc1d Added wxStringBufferLength: works like wxStringBuffer, except
it calls UngetWriteBuffer(size_t) instead of UngetWriteBuffer().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 20:08:47 +00:00
Mattia Barbon
bd5206ddbc Compilation fixes for wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 19:52:15 +00:00
Mattia Barbon
e589896152 MSVC 5 compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 19:47:19 +00:00
Mattia Barbon
6fd5903a1b GCC warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 19:45:45 +00:00
Mattia Barbon
d2e70462f1 Fix for crash when wxUSE_STL=1. wxDocument::DeleteAllViews might
delete "this", together with the list it is iterating over.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 19:44:47 +00:00
Mattia Barbon
a0749355ca Replace SendIdleEvents with ProcessIdle.
Remove unused variable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 19:38:49 +00:00
Václav Slavík
2ae7eb268c order the Makefile alphabetically so that diffs are human readable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 18:14:47 +00:00
Julian Smart
bf95a04f16 Added some standard further identifiers to help with WinCE toolbars
Moved wxID_REPLACE to defs.h
Can now add tools to WinCE toolbar, if using standard identifiers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 16:16:14 +00:00
Julian Smart
33b3f7c34a Nth -> Item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 16:12:52 +00:00
Julian Smart
39d2f9a7c8 Added WCE toolbar
Got menubars working with WCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 14:12:53 +00:00
Václav Slavík
560c9c2090 split win32 makefiles into shared config files and the rest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 13:52:04 +00:00
Václav Slavík
73d01310f6 split win32 makefiles into shared config files and the rest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 13:40:15 +00:00
Mattia Barbon
084db46c8b Fix unintialized pointer in wxCommandProcessor when
wxUSE_STL=0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 13:21:35 +00:00
Václav Slavík
feaed9410a don't assume ilink32.cfg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 09:16:20 +00:00
Robin Dunn
e14d10b039 Update to Scintilla 1.53
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 06:43:31 +00:00
Robin Dunn
15d9a04c68 stop usign a deprecated method, and ensure that the imagelist
ownership is trnasfered when using AssignImageList.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 02:29:57 +00:00
Robin Dunn
63b1cb8227 User the version number in the dir name of the private wxWindows install.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 02:28:09 +00:00
Robin Dunn
dd116e73f0 Minimal changes needed to build/run wxPython on the 2.5 branch after
the merge.  Still need to look for and apply most changes and new
additions that have happened since the last merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 02:26:53 +00:00
Robin Dunn
fd657b8a59 Added bakefile for the OGL contrib
Changed use of deprecated methods in OGL to new methods

Changes to allow OGL to be built without the deprecated wxExpr (again)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 02:09:34 +00:00
Robin Dunn
52fcf3b1bd Applied patch that converts the throbber to using timers instead of threads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 01:53:08 +00:00
Vadim Zeitlin
040e234d84 allow to change the event propagation level (modified patch 743086)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 00:48:49 +00:00
Vadim Zeitlin
1648d51bcb allow to change the event propagation level (modified patch 743086)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 00:39:05 +00:00
Vadim Zeitlin
b5a98acdf2 applied event speed up patch (752928)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 23:59:49 +00:00
Vadim Zeitlin
520200fd10 added format parameter to File/DirName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 23:39:28 +00:00
Vadim Zeitlin
fc4fe30871 describe better how to use ssociated mutex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 22:42:36 +00:00
Mattia Barbon
f3e28ade43 Remove incorrect and unnecessary wxEntryCleanup declaration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 22:25:30 +00:00
Mattia Barbon
f700f98cf5 Use correct types for comparison functions in wxArray,
wxSortedArray and wxSortedArrayString, when wxUSE_STL=1.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 22:23:43 +00:00
Vadim Zeitlin
bf07249cdd don't clear the handles list in dtor, it is static/global (patch 773029)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 22:03:28 +00:00
Vadim Zeitlin
8c74e477ed set richedit DLL handle to 0 after unloading (patch 768994)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 21:54:14 +00:00
Vadim Zeitlin
bb131fdbc5 updated colour definitions to the new official X version (patch 771272)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 21:47:07 +00:00
Vadim Zeitlin
cef9731ad9 treat the string passed to MakeRelativeTo() as directory even if it doesn't have a trailing slash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 21:22:39 +00:00
Vadim Zeitlin
3f1d375654 ignore exceptions during the execution of the exception handler to avoid infinite loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 21:03:48 +00:00
Vadim Zeitlin
d4cb34b02c strlen -> wxStrlen (patch 772985)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 20:59:01 +00:00
Robin Dunn
921f5019a6 Added generic drag image source file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 20:03:11 +00:00
Václav Slavík
d58ac9b7a9 fix for wrong implib name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 16:49:58 +00:00
Václav Slavík
ecb3b2a6fc added opengl libs for gcc and watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 16:05:45 +00:00
Václav Slavík
d6a6b74432 added OpenGL libs for gcc and watcom (other don't require it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 16:03:39 +00:00
Václav Slavík
76bdd7b31b added crashrpt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 15:48:03 +00:00
Václav Slavík
ff98bd681d dll compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 15:38:19 +00:00
Václav Slavík
0a7dc0911d OpenGL fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 15:35:13 +00:00
Václav Slavík
d8290dd058 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 14:18:19 +00:00
Václav Slavík
5d45df1f57 removed duplicate glcanvas entries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 14:14:05 +00:00
Václav Slavík
ea66c762e8 cross-compiled libraries have host embedded in the name again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 14:13:32 +00:00
Václav Slavík
34b08d2cf5 more OpenGL fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 13:16:24 +00:00
Vadim Zeitlin
f627fbee50 don't use fall back if we had already found the MIME type (patch 769826)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:50:04 +00:00
Vadim Zeitlin
f252f8c35d allocate string freed with free() later using malloc(), not new[] (fixes patch 772404)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:44:15 +00:00
Vadim Zeitlin
320656c465 updated Japanese translations (patch 769962)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:39:33 +00:00
Václav Slavík
50da51eea2 added dependency on opengl.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:20:26 +00:00
Václav Slavík
ace0fab4f1 remove extra space at top and bottom of the page if present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:11:10 +00:00
Václav Slavík
ef1b8570d5 more monobuild fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 09:59:24 +00:00
Vadim Zeitlin
2f55280287 useh higher value of _WIN32_IE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 09:46:49 +00:00
Václav Slavík
ff64116225 previous commit removed WXDLLIMPEXP_HTML by mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 09:26:31 +00:00
Václav Slavík
ec67c47431 don't use win-like names on mingw/cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 09:09:59 +00:00
Václav Slavík
496d012a89 fixes for monolib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 08:55:11 +00:00
Václav Slavík
eac90854bd compilation fixes for msw_gl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 08:31:33 +00:00
Václav Slavík
3e5c3c83e5 Apple's gcc fixes to bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 08:23:47 +00:00
Václav Slavík
957130ca06 added opengl.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 08:01:49 +00:00
Václav Slavík
4d2643327c re-added OpenGL canvas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 22:27:21 +00:00
Václav Slavík
e456894d57 added _gl library and removed install target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 22:26:21 +00:00
Václav Slavík
f34b7ba5e7 reordered headers a bit so that they are installed only when needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 22:25:34 +00:00
Ryan Norton
c0a7edde10 Tcl regex lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 22:03:51 +00:00
Václav Slavík
eb9dd1499c reordered headers a bit so that they are installed only when needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 21:10:33 +00:00
Václav Slavík
27ce9aef53 added wxBU_EXACTFIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 21:10:20 +00:00
Julian Smart
8651867dbc Different test for previously subclassed, for WinCE
(comparing WndProcs just doesn't work)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 20:40:57 +00:00
Julian Smart
2077b14882 Reordered winundef.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 20:34:46 +00:00
Robin Dunn
88f23fdd83 Added headers that didn't get installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 18:27:39 +00:00
David Elliott
ce319b6d1b Implement GetLabel and SetLabel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 14:54:59 +00:00
Václav Slavík
67158ef673 removed GetHorizontalConstraints -- no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 13:04:37 +00:00
Václav Slavík
36863a0a71 don't forget to backport HTML tables fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 13:03:29 +00:00
Václav Slavík
8c571f4650 tables can no longer be smaller than sum of their columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 13:00:58 +00:00
Václav Slavík
0493436fc1 -f-no-pcc-struct-return was only needed by ancient versions of gcc and it affected binary compatibility -> removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 10:34:42 +00:00
Vadim Zeitlin
5595986d65 compilation fix (missing wx/winundef.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 09:58:59 +00:00
Vadim Zeitlin
f83aa7771c really fixed compilation for old imagehlp.h header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 23:54:37 +00:00
Vadim Zeitlin
0b7824d78a attempt to fix compilation for old imagehlp.h header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 22:59:57 +00:00
Julian Smart
42d11c8e66 Compile with EVC 3.0 2002
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 22:28:21 +00:00
Václav Slavík
e7647357c6 regenerated after fixes to make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 22:01:05 +00:00
Vadim Zeitlin
ce39c39e1f we don't use wxUSE_FILENAME any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 20:49:39 +00:00
Václav Slavík
d7e91db264 added more missing headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 19:12:02 +00:00
Václav Slavík
2419f34582 no need to define STRICT here either
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:58:28 +00:00
Václav Slavík
9ed0d735d5 added <windows.h> wrapper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:52:32 +00:00
Václav Slavík
4b41ab2687 DigitalMars check didn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:44:13 +00:00
Václav Slavík
b6d93b260e don't break lines in the middle of word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:39:09 +00:00
Václav Slavík
8ba2f3ec94 don't break lines in the middle of word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:28:21 +00:00
Václav Slavík
515e94a608 cut-and-paste is not good idea, removed duplicated code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 16:47:07 +00:00
David Elliott
71bfb73508 Added wxAutoNSAutoreleasePool to DoGetBestSize method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 15:27:59 +00:00
David Elliott
c36a70f13c Added wxAutoNSAutoreleasePool to Create method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 15:25:20 +00:00
David Elliott
e51c36de5a Use wxAutoNSAutoreleasePool in Create() method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 15:15:52 +00:00
David Elliott
e92ea62916 SetStringSelection: wxString& should be const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 15:10:24 +00:00
David Elliott
82910736d5 wxCocoa: enable help system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 15:01:46 +00:00
David Elliott
7c9428abfd Added some stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:55:52 +00:00
Julian Smart
11b352343b Updated WinCE project file list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:45:24 +00:00
David Elliott
4144f58814 wxCocoa: Enable gauge and progress dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:26:33 +00:00
David Elliott
ec35ed7c1c wxCocoa: Added gauge.(mm|h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:23:24 +00:00
Julian Smart
f38dc50d5c Removed obsolete file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:21:09 +00:00
David Elliott
24e97652b0 wxCocoa: Added wxGauge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 14:04:22 +00:00
Julian Smart
73861e4bf3 Added Watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 13:54:57 +00:00
Julian Smart
0be9ace27e Added RTL functions missing from WinCE to wxchar.h/cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 13:46:39 +00:00
Julian Smart
529b7f71bd Small tweaks for WinCE compatibility
Use generic folder dialog for WinCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 13:15:48 +00:00
Julian Smart
1dedb80b26 Added missing functions WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 11:48:15 +00:00
Václav Slavík
b7e8f408c9 reverted two previous Julian's changes, they were incorrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 11:04:34 +00:00
Julian Smart
e2b6d07d7a Added call to top-level window OnInternalIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 10:24:30 +00:00
Julian Smart
b8d6102177 Fixed out by one error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 10:10:37 +00:00
Vadim Zeitlin
dc65f4ff28 updated recursive mutexes description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 23:35:28 +00:00
Václav Slavík
59d21254e8 RTL problems fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 20:30:38 +00:00
Václav Slavík
4b44ea2b40 added possibility to choose RTL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 20:28:04 +00:00
David Elliott
1c54c79268 After calling sizeToFit, round the size up to the next integer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 18:59:05 +00:00
David Elliott
addbdd2985 wxSpinCtrl abuses m_isShown. Don't use it for any logic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 18:10:47 +00:00
David Elliott
05b2214ba0 wxCocoa: Allow calendar control, spin button, spin control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 17:37:52 +00:00
David Elliott
36b46e2557 wxCocoa: added spinbutt.(mm|h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 17:36:30 +00:00
David Elliott
768d9ec8ca wxCocoa: Added wxSpinButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 17:33:36 +00:00
David Elliott
7a968ccd9d wxCocoa: enable combo box
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:10:03 +00:00
David Elliott
2ee09b5562 Added wxUSE_COMBOBOX guard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:06:52 +00:00
Václav Slavík
6e22c52489 updated to correctly install wx-config and wxMSW headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:05:25 +00:00
David Elliott
01a16fce4b wxCocoa: Added combobox.(mm|h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:03:38 +00:00
David Elliott
a6660cbb74 Fixed file header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:00:27 +00:00
David Elliott
421a84317f wxCocoa: Added basic (i.e. not working) implementation of wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 15:58:33 +00:00
Václav Slavík
cb3b19dbad fixed make install for wxMSW ole headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 15:41:46 +00:00
Václav Slavík
157a344056 fixed wx-config installation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 15:40:44 +00:00
Václav Slavík
1f6c7c4432 added missing header files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 15:02:30 +00:00
Václav Slavík
19c261dc84 removed --enable-precomp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:57:43 +00:00
David Elliott
49e5528add Added default argument (true) to Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:43:34 +00:00
David Elliott
d9006b9e20 wxCocoa: Allow find/replace dialog, font dialog, grid, and wizard dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:42:08 +00:00
David Elliott
8343764860 Added wxButtonBase::GetDefaultSize stub
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:22:42 +00:00
Mattia Barbon
d794dcb6d9 Use wxApp::ProcessIdle() instead of wxApp::SendIdleEvents().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:18:03 +00:00
David Elliott
88c8208626 wxCocoa: allow sash, splitter, and startup tips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:14:11 +00:00
David Elliott
d2022d2941 Use generic MDI with wxCocoa until a real implementation is done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 14:11:52 +00:00
David Elliott
15d521a109 Added (Start|End)DrawingOnTop stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 13:59:20 +00:00
David Elliott
bd3e8827dd Commented out wxAutoNSAutoreleasePool in CallOnInit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 13:19:50 +00:00
David Elliott
7fc77f30f4 Put wxAutoNSAutoreleasePool in methods that may be used outside the run loop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 13:10:32 +00:00
David Elliott
493902ac5b Use the new wx/cocoa/autorelease.h header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 13:05:19 +00:00
David Elliott
140e7468ab Place wxAutoNSAutoreleasePool in this header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 13:03:18 +00:00
Julian Smart
8b532f8c3d SendIdleEvents -> ProcessIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 09:09:00 +00:00
Julian Smart
955a919785 Rationalised OnIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 08:41:08 +00:00
David Elliott
9977626de4 Put OnIdle() back. Without deleting pending objects, frames that have
been Destroy()ed (e.g. by the default close implementation) never actually
get deleted and thus the program never terminates because the
wxTopLevelWindowBase destructor is never called to do ExitMainLoop()
FIXME: Why isn't this OnIdle stuff simply in wxAppBase?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 03:48:20 +00:00
David Elliott
6a9afc7adf In the object destructor, Disassociate the object from its Cocoa counterpart
but leave m_cocoaNSWindow intact so base class destructor can use it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 03:04:37 +00:00
David Elliott
fe169919d8 In destructor, pass the NSView ownership to the base class
Avoid extra if tests now that Associate/Disassociate do the test themselves


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 03:02:04 +00:00
David Elliott
bc34fa2617 Call -[NSApplication stop] instead of terminate. The stop message will
return to the caller allowing processing to continue until all events
have been processed.  Make sure that no more idle events are installed
by checking -[NSApplication isRunning].


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 02:46:12 +00:00
Vadim Zeitlin
5b72b34401 removed OnIdle() which didn't compile any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 00:50:57 +00:00
Vadim Zeitlin
28b4db7f89 ugly fix for warnings when wxUSE_STL==0 not breaking compilation when wxUSE_STL==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 22:53:49 +00:00
Vadim Zeitlin
c7e22c6923 mention wxCrashReport
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:33:56 +00:00
Vadim Zeitlin
e483f439b7 added crashrpt.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:31:23 +00:00
Vadim Zeitlin
c2892ef89b wxGlobalSEHandler() takes PEXCEPTION_POINTERS now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:31:11 +00:00
Vadim Zeitlin
8531cc2589 moved SEH stuff to crashrpt.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:29:37 +00:00
Vadim Zeitlin
81e3be0e46 added wxHAS_ICON_LOCATION and wxHAS_CRASH_REPORT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:19:26 +00:00
Vadim Zeitlin
50bea10032 wxSEHReport renamed to wxCrashReport enhanced and debugged; seems to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 21:18:04 +00:00
Mattia Barbon
335991afa5 Move #inclusion of wx/msw/winundef.h for MinGW to afterstd.h.
Fix WX_DEFINE_TYPEARRAY assert to refer to base array's elemnt type
rather than to void*.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 20:07:45 +00:00
Julian Smart
5109ae5d17 Improvements to OnIdle processing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 16:59:30 +00:00
Vadim Zeitlin
9c64071583 first version of crash reporting code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-13 02:28:11 +00:00
Julian Smart
92f1a59c28 Use WM_INITMENUPOPUP
Added wxMenu member to wxMenuEvent


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 23:09:04 +00:00
Mattia Barbon
1b80d34a52 Warning fixes for wxUSE_STL=1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:36:50 +00:00
Vadim Zeitlin
007007c5e4 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:36:48 +00:00
Vadim Zeitlin
f91e838284 set the containing sizer to NULL when destroying the sizer; this fixes a crash (don't ask me how could it work before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:36:31 +00:00
Mattia Barbon
fd82f4e6e9 Readd wxStringList::Add when wxUSE_STL=1, for compatibility with
wxUSE_STL=0. Fixed wxPathList double-free reported by Devid Elliot.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:34:34 +00:00
Mattia Barbon
8f520a56b7 Added and documented wxColourDatabase::AddColour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:11:51 +00:00
Julian Smart
7a02658071 Added wxWinceHelpController
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 20:11:24 +00:00
Julian Smart
882dfc6753 Added net stuff, some fixes to gsock code for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 17:58:22 +00:00
Vadim Zeitlin
f35746ceed fixed wxTempFile::Commit() broken by last check in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 16:08:54 +00:00
Julian Smart
09785dd38d Fixed menubar on WinCE
Removed some obsolete files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 15:11:00 +00:00
Vadim Zeitlin
8a8c41dd93 fixed incorrect RegOpenKeyEx() usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 14:18:04 +00:00
Vadim Zeitlin
d80096a2dd fixed a crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 14:07:01 +00:00
Julian Smart
40b83d2901 Removed obsolete file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 13:39:32 +00:00
Vadim Zeitlin
b4e4abb51c font is only non default if it has non default field values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 12:39:33 +00:00
Vadim Zeitlin
4ed40684b4 fix for a warning when wxUSE_STL == 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 11:28:39 +00:00
Vadim Zeitlin
29a2a24da6 fixed class/struct mismatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 11:17:14 +00:00
Vadim Zeitlin
b8c253ec50 fix for a warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 11:11:01 +00:00
Julian Smart
471085e408 Compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 07:06:32 +00:00
Mattia Barbon
89c20ac15c Fix some leaks cause by removing list.DeleteContents calls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 02:27:53 +00:00
Mattia Barbon
e59a80556e Remove duplicate colour entries.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 02:24:21 +00:00
Mattia Barbon
22a5055f1f Multilib linking fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 02:22:22 +00:00
David Elliott
010d343bb2 In the object destructor, leave m_cocoaNSView intact for base class destructors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 01:04:47 +00:00
David Elliott
570aaadf1f In the object destructor, Disassociate the object from its Cocoa counterpart
but leave m_cocoaNSView intact so base class destructors can use it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 00:52:50 +00:00
Julian Smart
4cb88a72da More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 23:10:35 +00:00
Julian Smart
f07dc2e2a7 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 23:04:34 +00:00
Vadim Zeitlin
52cd14b1c8 [attempt to] fix a warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 22:29:40 +00:00
Vadim Zeitlin
1ab378c03f fix for a warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 22:28:39 +00:00
Julian Smart
f1c75e0f93 Fixed some duff #ifdefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 22:06:00 +00:00
Julian Smart
4676948b68 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:50:07 +00:00
Julian Smart
086b3a5b02 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:43:57 +00:00
Stefan Csomor
2cf38c9783 apptraits in line for carbon and mach-o
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 20:17:15 +00:00
Stefan Csomor
d314acc0ba out of memory for strdup handled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 20:16:05 +00:00
Stefan Csomor
5a036f13b3 codewarrior fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 20:12:43 +00:00
Stefan Csomor
47ac4f9ba1 style creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 19:52:14 +00:00
Vadim Zeitlin
31222b7cfa fixed using arrays as nested classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 19:33:10 +00:00
Vadim Zeitlin
486f0e76c2 removed a :: from WX_CLEAR_HASHMAP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 19:01:55 +00:00
David Elliott
bac6f2348d Associate/Disassociate now check for non-NULL pointer instead of requiring
the caller to do so.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 17:47:57 +00:00
David Elliott
7d27dcf906 Implement SetValue() and GetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 13:43:57 +00:00
David Elliott
4aa75221eb * Removed BASE_AND_GUI_MAC_SRC. At the moment DARWIN/MAC are identical
(they both have only utilsunx.cpp) and Bakefile needs some work to allow
  more complex conditions before having this separate will be easy.
* Allow wxGTK to be built on OS X.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 13:19:48 +00:00
Julian Smart
b1e4e7cc96 Oops, no such function as wxIsascii
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 11:28:11 +00:00
Julian Smart
1c193821a9 More WinCE mods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 11:21:47 +00:00
Julian Smart
5e9670446a Further WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 11:15:59 +00:00
Jouk Jansen
8f5a042b12 Committing in .
OpenVMS compile issues

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/generic/listctrl.cpp
 	wxWindows/utils/dialoged/src/winprop.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 10:50:28 +00:00
Stefan Neis
6141773b49 Removed Auto3D variable following other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 23:33:39 +00:00
Vadim Zeitlin
7bb688a899 restored old wxCOMPILE_TIME_ASSERT2 definition as the new one doesn't work with VC6 E&C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 23:15:17 +00:00
Vadim Zeitlin
dfa4a244f0 VC++ warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 22:55:28 +00:00
Vadim Zeitlin
dcc970aff8 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 22:52:43 +00:00
Vadim Zeitlin
e1f448eeef corrected bug with alignment of static labels with GTK 2 (replaces patch 760066; closes bug 759375)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 22:32:52 +00:00
Julian Smart
7f0586ef60 Some WinCE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 21:14:50 +00:00
Mattia Barbon
fc10daf37c wxUSE_STL compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 21:14:14 +00:00
Mattia Barbon
65c0217e32 Compilation fix for wxUSE_STL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 21:12:25 +00:00
Mattia Barbon
116270c60a Use correct export directive for multilib.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 21:10:50 +00:00
David Elliott
c0440c7833 Add support for foreground and background colors to DoDrawText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 21:01:06 +00:00
David Elliott
ed88188933 Implement SetBackgroundMode()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 20:59:27 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Mattia Barbon
6992d326eb wxSortedArray::Add must return the index of the newly
inserted item.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:32:04 +00:00
Mattia Barbon
fcd0c90f75 Missing CHARSET_HANGUL fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:29:55 +00:00
Mattia Barbon
430ff60228 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:18:06 +00:00
Vadim Zeitlin
68d4172048 Wait() doesn't cancel the thread any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 17:10:16 +00:00
Vadim Zeitlin
92c8c54e7e trying to fix the bug which results in blocking forever inside Delete()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 16:34:45 +00:00
Vadim Zeitlin
57fd9bb239 fix for IsAlive() called after Kill() or Exit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 16:23:42 +00:00
Vadim Zeitlin
df6f82f048 allow adding/removing columns dynamically (based on patch 763540)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 15:51:47 +00:00
Stefan Csomor
cea9c546c2 added release event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 15:49:57 +00:00
Vadim Zeitlin
501aaa4b72 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 14:50:25 +00:00
Vadim Zeitlin
99e8cb505a GTK_TOOLBAR_BOTH_HORIZ is GTK 2 only (it would have been nice if the patch mentioned this...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 14:06:44 +00:00
Vadim Zeitlin
35cf1ec63c fixes to allow dragging in multiselection tree ctrl (patch 759421)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 13:03:30 +00:00
Vadim Zeitlin
ae8c4b33a3 added state image support (patch 530155)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:46:48 +00:00
David Elliott
68a14aeeeb include "wx/toolbar.h" instead of tbar(base|smpl).h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:39:13 +00:00
Vadim Zeitlin
78ee6a4750 added wxThreadHelper class (patch 756906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:36:05 +00:00
David Elliott
0148248250 Use wxGetEmptyString() so the types in the ?: statement are both wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:27:26 +00:00
Vadim Zeitlin
8c7e3f14fb more Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:24:15 +00:00
Vadim Zeitlin
251a8ce858 set string length properly in wxString(p, conv, len) ctor (patch 755593)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:13:49 +00:00
Vadim Zeitlin
50dee7e0eb make string at least empty (instead of containing garbage) if malloc() failed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:07:53 +00:00
Vadim Zeitlin
286034884f correction to the separators in vertical toolbar after patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:01:15 +00:00
Vadim Zeitlin
53663be8a5 added functions to read/write several elements at once (patch 754986)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:47:27 +00:00
Vadim Zeitlin
019abbf209 Unicode fixes (patch 754930)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:44:49 +00:00
Vadim Zeitlin
71414756b2 (blindly) fixed header case confusion (replacement for patch 763760)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:40:26 +00:00
Vadim Zeitlin
8a000b6b9e added state image support (patch 530155)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:16:34 +00:00
Vadim Zeitlin
7ab0c3adb7 keep selected image in sync with the normal one if it hasn't been changed (patch 754906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 11:04:37 +00:00
Vadim Zeitlin
f9dae7798b added wxTB_HORZ_TEXT (patch 713813); documented it; moved toolbar styles to toolbar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 10:53:00 +00:00
Vadim Zeitlin
341baa4c71 use gdk_fontset_load() instead of gdk_font_load() for better Japanese support (patch 698558)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 10:02:46 +00:00
Vadim Zeitlin
540b6b097f linking fixes and code cleanup after hotkey patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:56:47 +00:00
Vadim Zeitlin
654070ca23 allow wxPopupWindow get the key events (patch 713269)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:55:13 +00:00
Vadim Zeitlin
7ed43a6c7e mention opengl32lib/glu32.lib automatic inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:34:51 +00:00
Vadim Zeitlin
18759f7850 applied an extended version of patch 685795: clean up view [de]activation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:32:35 +00:00
Vadim Zeitlin
427716213f deTABified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:28:34 +00:00
Vadim Zeitlin
2b6d8c00fc (blind) fix for valgrind error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:23:47 +00:00
Julian Smart
5048c832bb Applied patch [ 758687 ] RegisterHotkey implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 09:16:00 +00:00
Julian Smart
fda7962d02 Applied patch [ 761138 ] Replaces references to wxT("") and _T("") with wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:36:14 +00:00
Julian Smart
7f03dc2854 Applied patch [ 762033 ] wxTextValidator crashes when given a NULL wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:21:49 +00:00
Julian Smart
3bb63e5c80 Partially applied patch [ 763900 ] fix for vertical toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:16:00 +00:00
Julian Smart
bf6e8dc931 Applied patch [ 767505 ] BCB6 link error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 07:50:57 +00:00
Julian Smart
e5651604ef Applied patch [ 767518 ] BCB6 resource compiler chokes on dialog1.rc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 07:47:10 +00:00
Vadim Zeitlin
e32f4a9fa9 preliminary implementation of wxEVT_MENU_OPEN/CLOSE for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 01:20:52 +00:00
Vadim Zeitlin
e4b712e245 wxMac doesn't need UseNativeStatusBar hack
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 01:00:24 +00:00
Vadim Zeitlin
bc92cdf992 no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 00:50:01 +00:00
Vadim Zeitlin
29c99ad359 fixed build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 00:27:26 +00:00
Vadim Zeitlin
7579971933 2 step creation for wxDocMDIChildFrame (patch 661657)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 23:25:27 +00:00
Vadim Zeitlin
0e82bd9614 automatically link with opengl32.lib and glu32.lib when using VC++ (patch 753485)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 23:18:40 +00:00
Vadim Zeitlin
d95525989d added wxSocket::IPAddress() (patch 694119)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 23:15:00 +00:00
Vadim Zeitlin
1f06669822 wxScrolledWindow scrollbar update fix (patch 680427) and MacUpdateImmediately renamed to Update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 23:08:22 +00:00
Vadim Zeitlin
2348a84293 made wxTextInputStream Unicode safe and general cleanup (patch 653775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:55:57 +00:00
Vadim Zeitlin
ed83150139 oops, compilation fix after applying the patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:47:02 +00:00
Vadim Zeitlin
7b4fee4930 we probably don't need crit section in GetTimeZone()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:46:06 +00:00
Vadim Zeitlin
869c75498a added some checks for .mo integrity (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:35:56 +00:00
Vadim Zeitlin
19de4eecd5 select all text initially in the control (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:24:54 +00:00
Vadim Zeitlin
a03c55c13c handle as well as in URLs (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:23:50 +00:00
Vadim Zeitlin
f9133b3200 added support for POST method and alternate ports (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:22:47 +00:00
Vadim Zeitlin
1f1c42109d implement support for returning several elements at once from IEnumFORMATETC (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:12:15 +00:00
Vadim Zeitlin
875c17fa8f ensure that we don't get stuck in modal loop forever (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 22:03:21 +00:00
Vadim Zeitlin
17a6a662f7 check index in GetString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:58:24 +00:00
Vadim Zeitlin
80bd086077 use mask for GIFs (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:56:09 +00:00
Vadim Zeitlin
30ed6e5c89 GetClientData(int n) should be const (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:55:04 +00:00
Vadim Zeitlin
997176a346 added missing #include <wx/defs.h> (parts of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:48:53 +00:00
Vadim Zeitlin
f9bd9677e8 fixed crash in wxSpinButton (patch 646214)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:38:05 +00:00
Vadim Zeitlin
cda66071f1 VC 7.1 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 21:20:56 +00:00
Vadim Zeitlin
b6ed2b860c attempts to fix separate compilation (didn't work)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 20:40:00 +00:00
Vadim Zeitlin
2d2d4fc709 test for Mac before Unix as __UNIX__ is defined as well when building wxBase under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 20:34:51 +00:00
Vadim Zeitlin
b93907ee8a typo in comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 20:34:29 +00:00
Vadim Zeitlin
71a660a312 removed some stray MSW code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 20:18:20 +00:00
Vadim Zeitlin
69268d6ded initialize wxStrings in initialization list, not ctor body; this is more efficient and incidentally also fixes crash under Mac with gcc 3.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 19:58:28 +00:00
Vadim Zeitlin
f85cfb32fa fixed gcc 3.3 compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 19:40:33 +00:00
David Elliott
3a531aebab Don't save and restore the graphics context for color changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 18:44:33 +00:00
David Elliott
9d180f3ad0 Implement wxWindowDC::Clear()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 18:38:44 +00:00
David Elliott
7bc429ef0a Implement SetBackground()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 18:37:18 +00:00
David Elliott
1a94b3d861 wxNullBrush should not be Ok(), and GetNSColor() should return clearColor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 18:34:42 +00:00
David Elliott
6631a2a562 wxBrushRefData constructor: m_style = style instead of wxSOLID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 18:31:34 +00:00
Julian Smart
5180055b69 OnIdle -> OnInternalIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 17:15:09 +00:00
Julian Smart
74039d33c7 Fixed a crash on initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 15:29:38 +00:00
David Elliott
d630f41d9b Set m_window instead of using wxWindowDC constructor taking a wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 15:26:41 +00:00
David Elliott
fcc9de5478 Store a pointer to the wxWindow in the wxWindowDC class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 14:56:56 +00:00
David Elliott
55c5be5e47 Avoid paint event recursion when the run loop is restarted inside the paint
event.  Usually for the purpose of showing an assertion dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 14:24:47 +00:00
Julian Smart
18afa2acbe Removed overloaded DoMenuUpdates function since it duplicated
wxMenu::UpdateUI()
Removed routing of menu commands to focus window under Windows
Added routing of menu commands (but not UI updates, for
efficiency reasons) to wxMenuBar before sending to frame


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 14:20:30 +00:00
David Elliott
63ad74ab2d Remove check for other wxPaintDCs. It should be done in wxWindow instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 14:10:53 +00:00
Julian Smart
e6d822952f Added cast to wxWindow*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 12:41:58 +00:00
Julian Smart
3c9676eabf Fixed missing bracket
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 11:00:40 +00:00
Julian Smart
e39af974ef - Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code.
- wxWindow::OnInternalIdle is now used in all ports, and ensures that
  user OnIdle events do not interfere with crucial internal processing.
- wxWindow::UpdateWindowUI is now a documented function that
  sends wxUpdateUIEvents, and can be overridden. It has a helper function
  DoUpdateWindowUI for taking appropriate wxUpdateUIEvent action.
- Added functions to wxUpdateUIEvent: Set/GetMode, Set/GetUpdateInterval,
  CanUpdate, to assist with optimising update event frequency.
- Added functions to wxIdleEvent: Set/GetMode, CanSend, to
  determine whether a window should receive idle events.
- Added wxWS_EX_PROCESS_IDLE, wxWS_EX_PROCESS_UI_UPDATES window
  styles for use with conservative idle and update event modes.
- wxMSW and wxGTK now send menu update events only when a menu is
  about to be used.
- Added WM_INITMENU processing instead of WM_ENTERMENULOOP, or
  accelerators don't always get called since menu items may still
  be disabled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 10:15:21 +00:00
Vadim Zeitlin
50b27824da compilation warning fixes (patch 625810)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 23:19:01 +00:00
Vadim Zeitlin
a647d42abc added support for wxALWAYS_SHOW_SB (finally closes patch 410865 -- first still opened...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 23:14:02 +00:00
Vadim Zeitlin
35821d8fe0 deprecated and removed from our code GetUseCtl3D()/TransparentBackground()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 23:02:14 +00:00
Vadim Zeitlin
b0cb01589f warnings fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:55:59 +00:00
Mattia Barbon
3e49e57746 More MSVC fixes .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:52:30 +00:00
Vadim Zeitlin
44c2d8d0f3 mingw compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:48:14 +00:00
Mattia Barbon
375894195f More MSVC fixes .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:24:26 +00:00
Vadim Zeitlin
44383ef7c6 got rid of (unused since a long time) wxNO_3D and wxUSER_COLOURS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:23:54 +00:00
Václav Slavík
036933194c fixes to wxHTML selection code: corrected mouse navigation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:11:59 +00:00
Mattia Barbon
c514cd532c Blind fix for MSVC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 22:07:59 +00:00
Mattia Barbon
360b63dd32 Morec ompilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 21:58:01 +00:00
Vadim Zeitlin
d5d58a93c3 renamed wxScrollHelper::GetRect() to GetScrollRect() to avoid conflicts with wxWindow method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 21:17:56 +00:00
Václav Slavík
510b9edbb6 standardized WXMAKINGDLL approach
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 20:47:17 +00:00
Václav Slavík
7da09e52ec added fl bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 20:46:43 +00:00
Mattia Barbon
a6abcf2ef8 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 20:41:48 +00:00
Václav Slavík
ec64c74532 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 20:34:04 +00:00
Mattia Barbon
6c44548a8f Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 20:25:26 +00:00
Mattia Barbon
df5168c427 Added --use-stl to cnfigure, wxUSE_STL to setup0.h
Moved wx/datetime.inl contents to wx/datetime.h and removed
inline redefinition hack.
  Implemented STL-like interface on top of wxList/wxArray, when wxUSE_STL=0.
  Implemented wxList-like and wxArray interfaces on top of std::list and
std::vector, when wxUSE_STL=1.
  Added arrstr.h, moved wxArrayString declaration there; string.h
#includes arrstr.h only if WXWIN_COMPATIBILITY_2_4 is enabled.
  Added WX_CLEAR_HASH_MAP, WX_CLEAR_HASH_TABLE, WX_CLEAR_LIST macros,
to clear a wxHashMap, wxHashTable, wxList containing pointers: deletes
pointers and makes container zero-sized.
  When wxUSE_STL=1, wxStringList works like a std::list<wxString>.
  Made wxBase compile when wxUSE_STL=1.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:52:35 +00:00
Václav Slavík
0598fd99db fixed DLL building bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:18:08 +00:00
Václav Slavík
09a3edeb9f added animate bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:17:11 +00:00
Václav Slavík
102174443d fixed animate in Unicode mode and removed use of deprecated methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:12:02 +00:00
Václav Slavík
54007a983a added animate contrib bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:09:57 +00:00
Václav Slavík
a4174c8674 added animate contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 19:08:08 +00:00
Václav Slavík
b87dd6f51e much better looking selection of justified paragraphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 18:44:34 +00:00
David Elliott
35c1cfdda1 wxBITMAP now uses XPM constructor for wxCocoa (like everything except wxMSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 15:59:51 +00:00
David Elliott
92e8d01997 wxCocoa: allow wxUSE_NUMBERDLG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 15:36:19 +00:00
David Elliott
a58a661464 Position the status bar properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 15:09:15 +00:00
Václav Slavík
67bbb91038 removed gcc warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 12:00:42 +00:00
Robert Roebling
2b904684fb Added Theme patch.
Upported mouse click detection change.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 11:26:04 +00:00
Robert Roebling
865864592a Corrected wxTreeCtrl and wxListCtrl end_label_edit event behaviour.
wxListCtrl doesn't send this event when the editing was cancelled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 11:24:52 +00:00
Vadim Zeitlin
aaaa609fa3 backport wxListCtrl::Refresh() fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 11:20:42 +00:00
Vadim Zeitlin
2f1e3c464c Refresh() didn't work as it wasn't passed to subwindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 11:19:10 +00:00
Robert Roebling
3a97d2db67 Upported mouse click detection change for wxChoice.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 11:18:42 +00:00
Václav Slavík
7244675df4 helpbest is MSW-only and init.h was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 20:58:58 +00:00
Václav Slavík
36b72b47ad helpbest is MSW-only and init.h was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 20:46:21 +00:00
David Elliott
c3b0c2c3dc Use NSColor from wxColour and wxBrush
#if 0 the bounding box drawn around all text (which was for testing)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 18:56:27 +00:00
David Elliott
f162a33801 First hack at wxBrush for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 18:53:00 +00:00
Julian Smart
0b30bb0bda Added wxFrameBase::OnMenuOpen, and wxUSE_IDLEMENUUPDATES in platform.h
Experimental wxUpdateUIEvent::SetUpdateInterval() function to limit
UI update frequency


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 16:21:44 +00:00
Vadim Zeitlin
f65a450a11 document the functions sending page changing events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 11:59:15 +00:00
Vadim Zeitlin
d9f7c16d4d compilation fix (extra semicolon)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 11:58:52 +00:00
Vadim Zeitlin
a400a8230f warning (in Unicode only) fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 11:48:42 +00:00
Vadim Zeitlin
0acfb5bd66 added wxEntry(char **) declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 11:48:22 +00:00
Vadim Zeitlin
9b9d4651ae mention that OnInit/Exit() should be used instead of wxApp/~wxApp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 11:14:19 +00:00
Václav Slavík
0d8dda3216 Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 08:56:16 +00:00
Václav Slavík
c1eb13891f caret.cpp was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 08:52:22 +00:00
Václav Slavík
56fae7b8f5 compilation fix for #ifdef __WXDEBUG__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 08:33:02 +00:00
Václav Slavík
41524ffcc6 applied modified UTF-8 locales patch (766893)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 08:28:44 +00:00
Václav Slavík
95318f7df2 configure didn't define __WXDEBUG__, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 08:05:16 +00:00
Vadim Zeitlin
a03cac3f78 don't east 100% of CPU when showing popup menu (patch 762500)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 23:26:19 +00:00
Václav Slavík
ee5749a6c1 updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 23:08:57 +00:00
Václav Slavík
0ca0570d33 regen XRC makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 23:01:27 +00:00
Václav Slavík
b7b7d2c79a updated main makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 22:53:41 +00:00
Václav Slavík
6c974d0b05 don't link wxBase against GUI libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 22:53:01 +00:00
Václav Slavík
3560dc761f added ability to build contrib samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 22:47:37 +00:00
Václav Slavík
4b53b01300 added xrcdemo bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 22:19:27 +00:00
Vadim Zeitlin
e8e4025d1b check for wrong wxID_OK usage (patch 758388)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 22:00:28 +00:00
Vadim Zeitlin
b19d494be1 documented Fit() brokenness if sizers are not used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:54:08 +00:00
Václav Slavík
df3dc50b64 don't link wxBase against GUI libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:53:05 +00:00
Václav Slavík
52de10ef15 don't delete samples datafiles, it may be dangerous
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:51:34 +00:00
Vadim Zeitlin
fdd55287d8 forward ported patch to IsEditable()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:43:00 +00:00
Vadim Zeitlin
01c6f3724e send more page change events (patch 750521); document this behaviour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:40:59 +00:00
Vadim Zeitlin
65bc172c97 implemented GetDefaultBorder() in wxControl, override it in some controls which don't want to have sunken style by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:35:32 +00:00
Vadim Zeitlin
b2644cc3cc compilation fix (extra semicolon)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:33:35 +00:00
Vadim Zeitlin
aede4ebb26 added GetBorder(flags)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:17:30 +00:00
Vadim Zeitlin
36b721632e wxNotebook::HitTest() for wxMSW added (patch 748469)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:13:00 +00:00
Vadim Zeitlin
e450aa692b wxNotebook::HitTest() for wxMSW added (patch 748469)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 21:02:24 +00:00
Vadim Zeitlin
ae79d31557 applied a patch to prevent another IsDialogMessage() hang
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 19:43:14 +00:00
Vadim Zeitlin
13e4c4d981 use HWND in tracing messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 19:14:19 +00:00
Václav Slavík
c74dc1630d don't link wxBase against GUI libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 18:55:09 +00:00
Julian Smart
fa10c70ceb Added wxHtmlPrintout::AddFilter so the same filters used for
viewing HTML can be used for printing it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 17:52:42 +00:00
Václav Slavík
7af0846427 wxConvGdk is not used anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 17:24:51 +00:00
Václav Slavík
21a94f3018 don't link wxBase against GUI libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 17:23:14 +00:00
David Elliott
d89d4059c8 Fixed some fields in the file header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 16:55:59 +00:00
David Elliott
cf923a86cd Remove finishLaunching method which called wxTheApp->OnInit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 16:54:17 +00:00
Václav Slavík
fd497edead compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 16:54:15 +00:00
Václav Slavík
991023b473 reverted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 16:46:32 +00:00
Václav Slavík
f3965110d2 where did this file disappear? added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 16:38:07 +00:00
Václav Slavík
817534abfd fixed USER_EXPORTED_ARRAY macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 15:56:30 +00:00
Václav Slavík
7a2102a813 include EXTRACFLAGS only once
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 12:05:51 +00:00
Vadim Zeitlin
68559fd50e fix for VC++ warnings about missing macro arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 00:02:25 +00:00
Vadim Zeitlin
9bf41e06ca added wxMAKE_UNIQUE_NAME to wx/defs.h, use it in wx/debug.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 23:56:32 +00:00
Vadim Zeitlin
c66cca2af0 added wxScopeGuard; test it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 23:56:08 +00:00
Václav Slavík
ad20b0b300 removed obsolete file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 23:14:08 +00:00
Václav Slavík
b1c331c58e added wxHTML bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 22:43:15 +00:00
Václav Slavík
b1169abb83 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 22:39:53 +00:00
Václav Slavík
77edbddb66 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 22:30:20 +00:00
Vadim Zeitlin
dc483f61b0 some float -> int conversion warnings suppressed (but I wonder if this is really the right thing to do?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 22:26:16 +00:00
Václav Slavík
c4c8eb79f9 added wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 22:18:10 +00:00
Václav Slavík
3fc387163d link against wxHtml
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 21:15:19 +00:00
Václav Slavík
64a2a46fc6 call wxBase built as part of wxMac wxbase_carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 21:08:03 +00:00
Václav Slavík
dc838d98f1 removed some obsolete parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:58:15 +00:00
Václav Slavík
55826fcf4f adde wxSTC bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:50:46 +00:00
Václav Slavík
d78c94f200 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:45:00 +00:00
Václav Slavík
0689c79e4e added wxLC_VIRTUAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:39:01 +00:00
Václav Slavík
fce7f77fc4 added wxSTC bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:38:01 +00:00
Stefan Csomor
5fe384748c changed Remove to RemoveAt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 19:48:05 +00:00
Stefan Csomor
2bb1e1f476 moved c-runtime functions for CW here, only add strdup for MSL versions prior to PRO 8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 19:47:07 +00:00
Stefan Csomor
56f69d54fa moved c-runtime functions for CW to wxchar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 19:46:22 +00:00
Václav Slavík
5646c3f82d fixed bug in previous commit: WXTOPDIR not set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 19:21:29 +00:00
Václav Slavík
3fe8bc147c regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 18:46:46 +00:00
Václav Slavík
b714ea8acc regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 18:39:59 +00:00
Václav Slavík
31009f332b added watcom makefiles; smaller build/bakefiles/Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 18:33:22 +00:00
Václav Slavík
02980527a0 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 17:54:54 +00:00
Václav Slavík
a7140600c9 removed WXUSINGDLL_FOO, one WXUSINGDLL is enough
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 17:11:57 +00:00
Václav Slavík
ed4c6c69a9 modules don't have to be exported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 17:03:01 +00:00
Václav Slavík
0c2f35dc94 DLL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 16:58:34 +00:00
Václav Slavík
bc5573b112 DLL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 16:49:37 +00:00
Václav Slavík
e433504316 workaround a Watcom build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 15:35:32 +00:00
Václav Slavík
344ca5315d define wxCHECK_W32API_VERSION for OpenWatcom and DigitalMars
compilers because both of them use w32api


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 15:01:13 +00:00
Václav Slavík
ac776ec973 define wxCHECK_W32API_VERSION for OpenWatcom and DigitalMars
compilers because both of them use w32api


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 14:50:26 +00:00
Václav Slavík
149cc21856 ...and so must 3rd party libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 14:25:35 +00:00
Václav Slavík
227a985574 fixed installation of wxHTML headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 14:24:12 +00:00
Václav Slavík
5e3746dc75 samples must use same settings as the libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 14:19:41 +00:00
Václav Slavík
96b9e9b39c removed redundant app-type tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 14:05:09 +00:00
Vadim Zeitlin
192a6c88dc bring base class AddFile()s in scope manually, without using 'using'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 23:49:58 +00:00
Vadim Zeitlin
3943f86765 regenerated after Mattia's changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 23:15:04 +00:00
Vadim Zeitlin
2baf627208 test multiple extensions in wxDocTemplate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 23:12:11 +00:00
Václav Slavík
42bf837cea fix monodll build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 22:50:06 +00:00
Mattia Barbon
fc599dde5d Blind bakefile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 21:23:19 +00:00
Mattia Barbon
ddf5de5b46 Applied first part of Roger Gammans' wxHashMap patch: reduce
number of value_type() constructor calls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 21:22:05 +00:00
Vadim Zeitlin
7764f97370 fixed crash in wxExecute() introduced during base/GUI split
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 20:08:56 +00:00
Vadim Zeitlin
45a8135252 quick fix for Unix build (upper cased builtin, this should be done in bakefiles, of course...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 20:06:21 +00:00
Stefan Csomor
c3a05e8a57 trying to avoid unneccessary redraws by not invalidating areas for windows that are not shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:59:34 +00:00
Stefan Csomor
7434de7498 flag removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:57:37 +00:00
Stefan Csomor
536732e482 app traits support and CW Debug output fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:57:03 +00:00
Stefan Csomor
a3b83a5137 new files added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:55:32 +00:00
Stefan Csomor
e0ebbbd9e9 pid removed from temp file name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:54:31 +00:00
Stefan Csomor
0ff5799aca debug output for CW corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:53:21 +00:00
Stefan Csomor
5e0d7b6bce pc 2 mac conversion for file operations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:52:34 +00:00
Stefan Csomor
22cf5eef64 apptraits for wxMac classic and carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:47:59 +00:00
Stefan Csomor
4367345099 path translation (umlauts) added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:46:44 +00:00
Stefan Csomor
41f12fa982 wxMac (classic & carbon) support added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:46:11 +00:00
Václav Slavík
3b20263dbd added Mingw makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:36:51 +00:00
Václav Slavík
2621ddf3f2 added XRC makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 19:32:13 +00:00
Václav Slavík
0706fb236c regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:40:50 +00:00
Václav Slavík
c6488584c8 "oldnames" library is not needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:19:59 +00:00
Václav Slavík
4460b6c48b fixed compilation of multilib dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:18:11 +00:00
Václav Slavík
40a8832891 fixed compilation of multilib dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:08:53 +00:00
Václav Slavík
36758fc6a5 added wxprec.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:07:25 +00:00
Václav Slavík
1fa9e5bc44 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:06:18 +00:00
Václav Slavík
687dcff3a4 added wxprec.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:03:29 +00:00
Václav Slavík
e6978d5b4d call base library in multilib build e.g. wx25base_bcc, not wx25_base_bcc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 17:21:42 +00:00
Václav Slavík
c5c570b934 define __GNUWIN32__ if __MINGW32__ is defined, so that it doesn't have to be defined on command line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 17:04:02 +00:00
Václav Slavík
65fb1c1160 extra flags for Mingw if needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 16:58:02 +00:00
Václav Slavík
73f40bef60 libjpeg needs to include wx/setup.h when compiled w/ gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 16:33:38 +00:00
Václav Slavík
c3b14ba4f7 fixed location of dummy.cpp, so that contrib makefiles can use it as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 16:23:55 +00:00
Václav Slavík
2e1a466fcb 1. added Mingw makefiles
2. fixed building of contrib libraries


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 16:19:07 +00:00
Václav Slavík
4765217040 added phony target setup_h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 14:59:11 +00:00
Václav Slavík
bdb03aa978 don't use "objs_" prefix for object directories
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 14:57:46 +00:00
Václav Slavík
3af038c0dc regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 14:03:07 +00:00
Václav Slavík
9c859e43d7 multilib linking fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:45:12 +00:00
Václav Slavík
3e89eafb7c dll fixes, prefix fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:43:09 +00:00
Václav Slavík
30dc34551b fixes for MSW/DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:33:42 +00:00
Václav Slavík
a903585074 moved helpbest and htmllbox to wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:04:27 +00:00
Václav Slavík
6acba9a719 fixes for moving wxHTML files into their own DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:04:05 +00:00
Václav Slavík
bb24c68f35 compilation fixes for multilib/DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:00:07 +00:00
Jouk Jansen
f66a3db9d1 Committing in .
include init.cpp in make procedure for OpenVMS

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 11:05:44 +00:00
Mattia Barbon
fd3f01603a wxArrayString::Sort(bool) not deprecated (yet).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 09:01:46 +00:00
Mattia Barbon
d4c92f55d4 Updated wxArrayString documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 22:01:56 +00:00
Mattia Barbon
ba8c160144 Moved some methods/classes inside COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 21:59:55 +00:00
Mattia Barbon
2ea4a2f552 GCC 2.95.3 compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 21:54:50 +00:00
Mattia Barbon
62809cbcb0 Blind bakefile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 21:54:09 +00:00
Vadim Zeitlin
aa4b42f0b7 fixed a typo in IsExposed, put SetValidator in correct (in alpha order) place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 19:12:55 +00:00
David Elliott
7796b3d660 Added GetNSColor() accessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 17:59:52 +00:00
David Elliott
d318df4bbb Provide empty stubs for constructors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 17:51:08 +00:00
Vadim Zeitlin
4827630066 workaround BCC bug resulting in E2233 when building the DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 16:43:16 +00:00
Julian Smart
486c8bdfc9 Removed duplicate wxTrace functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 15:47:28 +00:00
David Elliott
47f1ad6a71 Provide NSAutoreleasePool instances during initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 15:36:09 +00:00
David Elliott
7fbc89bb02 Added CallOnInit() which allows the toolkit (wxCocoa) to do a bit of
processing around the real OnInit() call.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 15:32:11 +00:00
Václav Slavík
eee614d37e fixed compilation of multilib dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 13:25:58 +00:00
Vadim Zeitlin
a8f12b67c4 fix for base class AddFile visibility and DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 13:06:21 +00:00
Vadim Zeitlin
7843d11bdc removed static methods from wxAppTraitsBase, this doesn't work well in non-monolithic DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 12:42:14 +00:00
Václav Slavík
ee2b827101 include system directory explicitly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 11:35:37 +00:00
Václav Slavík
ec6ac3eb94 this is nasty but required compilation fix, otherwise we get dllimport/dllexport mismatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 11:04:03 +00:00
Václav Slavík
7af1b53999 another compilation fix for multilib DLLs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 10:45:11 +00:00
Vadim Zeitlin
f6e7cd0a19 fixed comment and docs for GetSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 09:58:36 +00:00
Vadim Zeitlin
90e3949c04 use GetSize() instead of deprecated StreamSize() in the examples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 09:56:57 +00:00
Vadim Zeitlin
b9e19bd943 added recent new files (still can't run bakefile to regen the makefiles though...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 01:24:51 +00:00
Václav Slavík
6f6280738e regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 23:52:47 +00:00
Václav Slavík
0d46ad252f regen MSVC makefiles, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 23:40:30 +00:00
Robin Dunn
1fded56b37 wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 23:13:10 +00:00
Václav Slavík
e234d4c9b7 added visual c++ makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 22:44:32 +00:00
Václav Slavík
84955c7cab 1. updated borland makefile
2. added visual c++ makefile


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 22:39:26 +00:00
Václav Slavík
cb8bbc1325 more #defines, libraries and precompiled headers work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 22:29:29 +00:00
Mattia Barbon
7219fc4f39 Borland (5.5) compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 21:39:49 +00:00
Mattia Barbon
d546eba94e Check for null pointer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 21:04:24 +00:00
David Elliott
28ce308659 Removed Vadim's comment. Added comment explaining when posing can be done.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 20:54:50 +00:00
David Elliott
87d77923a6 Removed conflicting wxEntry prototype
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 20:48:29 +00:00
David Elliott
462bc04863 It was not acceptable to call the class method from the static initializer
because it caused the load and initialize methods to be called.  Some of the
load and initialize methods used autorelease which would lead to warnings
about memory leaks (true, though very benign).
This version delays all Objective-C calls until InitializePosers().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 20:46:34 +00:00
David Elliott
fd8668e46b Changed BASE_DARWIN_SRC to match BASE_UNIX_SRC
Removed $(BASE_UNIX_SRC/HDR) from COCOA_LOWLEVEL_SRC/HDR


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 19:46:13 +00:00
Mattia Barbon
7abde9c65a Remove now unneeded header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 17:19:15 +00:00
Mattia Barbon
dc6d5e38c0 More COMPATIBILITY_2_4 fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 17:18:13 +00:00
Mattia Barbon
3d74ef6a28 Blind bakefile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 17:13:31 +00:00
Mattia Barbon
f526f7526b Quick and dirty fix for building with COMPATIBILITY_2_4 off.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 17:11:19 +00:00
Václav Slavík
c04b9739f6 fixed: makefile.bcc was wrongly generated when bakefile ran on unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 15:51:53 +00:00
David Elliott
622dca25c3 src/mac/corersrc.r is in $(top_srcdir) not ".."
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 15:29:44 +00:00
Julian Smart
394285343b Fixed ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 13:45:49 +00:00
Václav Slavík
3d97f1823a reverted previous change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 13:01:44 +00:00
Václav Slavík
fd24237519 fixed to make wxBase DLL compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 12:50:48 +00:00
Václav Slavík
3d41c70801 don't required all WXMAKINGDLL_FOO defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 11:59:14 +00:00
Václav Slavík
81659205e3 support for building multilib DLLs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 11:56:47 +00:00
Julian Smart
b85b77ae2f Removed BC++ hidden virtual function warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 11:44:24 +00:00
Vadim Zeitlin
3e3be693d0 got rid of wxBuffer (finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 02:09:44 +00:00
Vadim Zeitlin
bddd7a8d89 renamed WXDLLEXPORT_BASE/CORE to WXDLLIMPEXP_BASE/CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 01:59:24 +00:00
Vadim Zeitlin
886dd7d28e fixes needed for separate DLL build to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 01:41:23 +00:00
Václav Slavík
9feb77164b preparing for fix to OSX problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 23:40:37 +00:00
Václav Slavík
4574209d7a added wx_sample_console
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 21:50:34 +00:00
Václav Slavík
7dbc8e4f9c console sample is not GUI app
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 21:49:47 +00:00
Václav Slavík
44404ecd1d Borland C++ makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 20:37:01 +00:00
Vadim Zeitlin
815ac4a7d9 init more (all?) member variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 20:18:43 +00:00
Mattia Barbon
b3dfbbc910 MinGW compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 20:02:59 +00:00
Václav Slavík
d5c22e0757 fixed duplicate file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 19:26:26 +00:00
Vadim Zeitlin
075131fda6 added initloc.h to, removed timer.h from base headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 17:40:06 +00:00
David Elliott
dcc7f39c44 Declare wxObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 17:19:15 +00:00
Vadim Zeitlin
002568cc7f documented wxUSE_GUI/BASE and __WXBASE__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 14:48:27 +00:00
Vadim Zeitlin
648762b1b4 removed WXDLLEXPORT_CTORFN (was always empty anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 14:42:49 +00:00
Václav Slavík
7340bea24f fix multilib compilation on windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 13:29:58 +00:00
Václav Slavík
15b44c69ab dependencies fixes
define __WXDEBUG__ and wxUSE_UNICODE on Windows


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 13:26:33 +00:00
Václav Slavík
6f53cd7c9e no EXTRALIBS on windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 13:20:57 +00:00
Václav Slavík
580ac8cb57 fixed $(top_srcdir)// bug, should be $(top_srcdir)/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:53:02 +00:00
Vadim Zeitlin
005b5298e4 suppress warning about unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:39:08 +00:00
Vadim Zeitlin
5b0040077d fixed crash on startup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:30:39 +00:00
Vadim Zeitlin
9bb1b05540 removed unused method declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:29:25 +00:00
Vadim Zeitlin
cd478a9509 GetOsVersion() is now wxGUIAppTraits method instead of a global function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:23:45 +00:00
Vadim Zeitlin
70dc287a39 removed wxFunction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:19:10 +00:00
Vadim Zeitlin
b28b097d59 added Bulgarian translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 11:42:35 +00:00
Václav Slavík
4d11f6cad1 oops, this doesn't belong there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 09:01:27 +00:00
Václav Slavík
7b11429dc3 fixed include paths to our copies of 3rd party libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 08:48:34 +00:00
Vadim Zeitlin
ea28b8853b fixed VC++ warning in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 00:33:20 +00:00
Vadim Zeitlin
150cb19558 fixed Unicode compilation and run-time problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 00:29:47 +00:00
Václav Slavík
80c29153f2 fixed incorrect wxUniv rules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 00:21:47 +00:00
Václav Slavík
b94026a0cb fix dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 00:09:57 +00:00
Václav Slavík
6c6df83a3e fix dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 23:46:11 +00:00
Vadim Zeitlin
81345eef34 regenerated with autocofn 2.57
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:53:38 +00:00
Vadim Zeitlin
b2e972ec6c added missing #include bitmap.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:38:17 +00:00
Václav Slavík
caad671d5e moved more files to wxBase for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:36:22 +00:00
Václav Slavík
71bdc994d4 bakefile fixes for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:34:27 +00:00
Václav Slavík
8021038362 moved more files to wxBase for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:21:14 +00:00
Václav Slavík
71e83a03e5 fix to shared libs name on nonwin32 platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:05:10 +00:00
Václav Slavík
b5fe69248a fixed missing WXDLLEXPORT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 22:01:31 +00:00
Vadim Zeitlin
13bdd545fb we can't declare WinMain() with other arguments using Borland, revert to including windows.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:49:00 +00:00
Václav Slavík
6b7cbde472 fix to shared libs name on nonwin32 platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:44:07 +00:00
Václav Slavík
cff5df9f18 making windows compilation work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:41:29 +00:00
Václav Slavík
b00786ec12 added init.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:39:58 +00:00
Vadim Zeitlin
0fcbaf23fd include init.h as wxEntry is supposed to be declared here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:39:25 +00:00
Václav Slavík
9a4c649ea2 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:22:18 +00:00
Vadim Zeitlin
7e7d30dae4 removed old wxEntry() declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:14:06 +00:00
Vadim Zeitlin
6abf9dacb0 removed old wxEntry declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 21:01:48 +00:00
Vadim Zeitlin
abca8ebff1 small wxGTK compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 20:33:30 +00:00
Václav Slavík
4f4a180e21 added init.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 20:30:38 +00:00
Vadim Zeitlin
55e90a2ea9 added empty Init/CleanUpStandardHandlers() for compatibility with the other platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 20:11:23 +00:00
Vadim Zeitlin
05e2b077c6 more work on fixing wxEntry() and ANSI/Unicode cmd line args mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 20:02:05 +00:00
Václav Slavík
712589478e fixed location of mac resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 18:44:43 +00:00
Vadim Zeitlin
9482617091 extracted common initialization/cleanup functions in common/init.cpp; standardized wxEntry()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 18:43:09 +00:00
Robin Dunn
041973c55e Check for and allow zero length files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 17:37:34 +00:00
Václav Slavík
7142ac377a fixed missing rules for tif_unix.c on Mac and other manifestations of the same bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 16:14:18 +00:00
Václav Slavík
4c8b7f4b2d another fix to bk-deps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 15:35:37 +00:00
Julian Smart
97e1d37c96 Documented event sink
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 13:35:55 +00:00
Julian Smart
65b17727e6 Added optional event sink for use with dynamic event tables
Removed comments and commented-out code re. focus window processing
from wxToolBarBase


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 13:11:51 +00:00
Jouk Jansen
d48568a5ec Committing in .
fix for new getosversion procedure.

 Modified Files:
 	wxWindows/src/motif/descrip.mms wxWindows/src/motif/utils.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 12:56:42 +00:00
Jouk Jansen
04272d5883 Committing in .
Updated OpenVMS compile support

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 10:35:08 +00:00
Vadim Zeitlin
db882c5431 added wxCRIT_SECT_DECLARE_MEMBER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-30 01:18:10 +00:00
Václav Slavík
adb4b1488a regenerated: smaller makefiles with new bakefile version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 23:25:27 +00:00
Vadim Zeitlin
5455e22751 added release()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 15:44:08 +00:00
Stefan Neis
86c7378f32 Applied Patch 760644 (wxGrid SetTable uses deleted wxGridTable).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 15:18:46 +00:00
Vadim Zeitlin
789bdf9b18 documented wxIsMainThread() and other thread-related stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 11:52:16 +00:00
Vadim Zeitlin
12b55afaf3 corrected link in see also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 11:51:42 +00:00
Vadim Zeitlin
17dbd23000 added wxIsMainThread()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 11:51:17 +00:00
Václav Slavík
f0290fcacd oops, partially reverted previous commit, it was incorrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 09:25:45 +00:00
Václav Slavík
fddeb06b11 use CODE_GEN_FLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 09:17:26 +00:00
Václav Slavík
fcf61db4d1 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:43:30 +00:00
Vadim Zeitlin
a03675d9ba compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:39:13 +00:00
Vadim Zeitlin
22f69dd493 we don't need to include wx/mac/private.h, at least under OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:35:07 +00:00
Vadim Zeitlin
2ba721aa6c fix for compiling in wxUSE_GUI == 0 mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:32:06 +00:00
Václav Slavík
4fc5f50932 naming convention fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:03:46 +00:00
Václav Slavík
8ee2dd0536 more bakefile optimalizations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:02:14 +00:00
Václav Slavík
f1a004eb19 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 00:02:10 +00:00
Vadim Zeitlin
66feaf3bbf fix for comparison bug in GetHeader()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 23:40:29 +00:00
Mattia Barbon
695578271d Stop GCC from complaining about unhandled enumeration values.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 20:56:40 +00:00
Václav Slavík
d8f97a0c52 MacOS X fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 17:18:46 +00:00
Václav Slavík
baa6e1d6a8 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 16:08:36 +00:00
Václav Slavík
bbc1cf3fd4 missing libbase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 16:07:49 +00:00
Václav Slavík
b625909cd6 samples/console is buildable as part of multilib, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 15:59:01 +00:00
Václav Slavík
f95cd8fab8 update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 15:06:43 +00:00
Václav Slavík
fd3880a72e don't create samples/autoconf_inc.m4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 15:00:23 +00:00
Václav Slavík
d974277526 fixed dll extension when crosscompiling for win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 14:33:31 +00:00
Václav Slavík
8a7c93a384 libgdi32.a is not included in console apps by mingw, but we required it in wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 14:23:59 +00:00
Václav Slavík
c7dfb5bb48 upstream fixes in bakefile's handling of mutually exclusive targets with same name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 14:14:22 +00:00
Václav Slavík
5ab5f2a3dc typo fix (bakefile needs error checking...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 13:52:55 +00:00
Vadim Zeitlin
1d6a432423 fixed fatal crash in Create() after my last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 13:12:00 +00:00
Václav Slavík
6fd9f0a474 wxUSE_BASE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 13:10:36 +00:00
Václav Slavík
827f829c6b fixed libtiff build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 12:34:54 +00:00
Václav Slavík
e292124a6b libtiff build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 12:34:02 +00:00
Václav Slavík
c15d9c859c fixed linker errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 12:33:09 +00:00
Vadim Zeitlin
2bf2d09ed0 replaced wxGetOsVersion() with wxGUIAppTraits::GetOSVersion()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 12:23:27 +00:00
Vadim Zeitlin
a40af6f957 fixed unused variable warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 12:21:09 +00:00
Vadim Zeitlin
a905235eb0 fixed sscanf() format string typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 11:59:02 +00:00
Václav Slavík
dffbab5eca use BASE_UNIX_SRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 11:54:40 +00:00
Vadim Zeitlin
166263e652 don't generate makefiles for the samples which don't build in current configuration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 11:49:34 +00:00
Vadim Zeitlin
9de9b8f0fc don't output strange "base (hosted)" message when not cross-compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 11:39:19 +00:00
Vadim Zeitlin
6c3e36af8f only configure programs which compile without GUI when building wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 11:34:41 +00:00
Stefan Csomor
a5c1f8ca21 function key support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 06:59:30 +00:00
David Elliott
31d20b589d Added more generic implementation files to wxCocoa files list
FIXME: Update list of header files
Added all of the UNIX implementation files
FIXME: Make this use the base UNIX list of files (like any other UNIX port)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 04:12:18 +00:00
David Elliott
e7f11f60d0 include "wx/setup.h" before testing for wxUSE_SLIDER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 04:05:25 +00:00
David Elliott
a631300cb8 Added wxGUIAppTraits::GetOSVersion() implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-28 04:03:11 +00:00
Václav Slavík
498368e9e4 fixed stupid bug - failure to generate samples/makefile.bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 23:57:25 +00:00
Václav Slavík
cbdf98e37b fixed command line arguments order problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 23:48:31 +00:00
Václav Slavík
09d2927055 needs wxbase, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 23:47:43 +00:00
David Elliott
c7b296c2f9 Removed wxGetOsVersion stub. It's now handled by utilscmn.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 23:40:06 +00:00
Václav Slavík
546a7e42a2 it's the other way around..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 23:24:12 +00:00
Václav Slavík
6b9d41a5ea bk-deps fixes and win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 21:59:09 +00:00
Václav Slavík
4d2efb51e6 fixed linking against 3rd party libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 21:55:22 +00:00
Václav Slavík
f5f530fd9f added Borland C++ makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 21:53:57 +00:00
Václav Slavík
82cb028026 different name for release and debug build of third party libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 21:29:07 +00:00
Vadim Zeitlin
497b8e091e added RefreshItem[s]()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 21:15:05 +00:00
Václav Slavík
cdc0282e61 1. more borland work
2. added optimization and debug info flags


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 19:22:12 +00:00
Václav Slavík
4843dc4cda misc win32 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 13:47:59 +00:00
Václav Slavík
4cd612f944 install setup.h before compiling on windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 13:41:21 +00:00
Václav Slavík
468375fe69 fixed linking against builtin 3rd party libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 13:38:27 +00:00
Václav Slavík
332cc656f3 1) Added INC_FOO variable with include directory for 3rd party libraries
2) Don't compile ODBC on Windows


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 13:25:11 +00:00
Václav Slavík
42d54220ee compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 10:09:19 +00:00
Václav Slavík
e6b02f3f26 another compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 09:59:00 +00:00
Václav Slavík
60ab32727e compilation fix for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 09:57:43 +00:00
Václav Slavík
9cce3be7ae Windows compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 09:55:13 +00:00
Václav Slavík
66fc790841 changed WXTOPDIR definition to not begin with /
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 09:32:58 +00:00
Vadim Zeitlin
2739d4f052 moved GetOSVersion() to the base traits class; implement it in platform-specific files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 00:16:04 +00:00
Vadim Zeitlin
18f0a2c5aa TryParent()/ProcessEvent() were included in both base and GUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 00:07:05 +00:00
Vadim Zeitlin
ec67cff1f6 __WXBASE__ -> wxUSE_BASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 23:46:00 +00:00
Václav Slavík
882b369df3 CR/LF fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 22:16:20 +00:00
Václav Slavík
eefdc53ac7 preliminary work on borland bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 21:30:40 +00:00
Václav Slavík
5f0ccb412e fixed dependency tracking if . not in PATH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 21:17:51 +00:00
Václav Slavík
846704576c build event.cpp into both wxBase and wxGUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 21:17:16 +00:00
Julian Smart
5c2e937699 Removed 16-bit conditional compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 17:47:47 +00:00
Julian Smart
9c110148e8 Corrected small typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 17:29:33 +00:00
Julian Smart
aaace8739a Removed WIN16 references
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 17:26:34 +00:00
Julian Smart
b073db94f2 Removed obsolete code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 17:10:14 +00:00
Vadim Zeitlin
1e0af0bcda added EstimateTotalHeight
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 15:39:24 +00:00
Julian Smart
ae500232a4 Added m_ prefix to wxColourData and wxFontData members for consistency.
Fixed some typos in comments.
Fixed wizard constructor doc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 13:15:12 +00:00
Vadim Zeitlin
22c2307c2b pass event to validators fisrt, before using the dynamic event table
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 13:00:56 +00:00
Vadim Zeitlin
8b655af19d compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 12:45:18 +00:00
Chris Elliott
df2309bac7 remove conflicts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 11:22:50 +00:00
Vadim Zeitlin
034957673c changing the number of items in wxHtmlListBox should flush the cache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 10:05:13 +00:00
Vadim Zeitlin
2887179b1f compilation fixes for separate build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 01:14:22 +00:00
Vadim Zeitlin
d6045bb81d compilation fix for wxGUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 01:10:41 +00:00
Vadim Zeitlin
4caf847c87 got rid of wxEvtHandler::m_isWindow, use virtual functions (overridden in wxWindow) instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 00:44:55 +00:00
Vadim Zeitlin
3ed2104c99 some more #if wxUSE_BASE (but still not enough)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 23:50:35 +00:00
Vadim Zeitlin
5fb98c22c2 extracted wxStopWatch and global timer functions in a separate file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 23:49:45 +00:00
Václav Slavík
21c557b8f4 added stopwatch.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 23:27:59 +00:00
Gilles Depeyrot
12aec44572 corrected resource file compilation command for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 20:12:33 +00:00
Václav Slavík
86ec293520 no need for --enable-soname anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:54:06 +00:00
Václav Slavík
1936dc8b29 more fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:50:04 +00:00
Václav Slavík
50d11be16b new dependencies tracking code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:43:11 +00:00
Václav Slavík
c656b78389 new dependencies tracking code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:27:50 +00:00
Václav Slavík
3e03bdd85f use MacOS X resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:07:02 +00:00
Václav Slavík
2df276eaac updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 19:02:37 +00:00
Václav Slavík
acf38e5f19 added gizmos makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 18:48:54 +00:00
Václav Slavík
bce78bdc42 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 18:44:11 +00:00
Václav Slavík
d1d83c9b7d blind wxCocoa fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 18:31:51 +00:00
Václav Slavík
47f9586840 top_builddir is part of bakefile now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 18:30:52 +00:00
Václav Slavík
49b0a3aad9 new dependency tracking from bakefile cvs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 18:14:32 +00:00
Roger Gammans
a1c7887200 correct documentation for wxEVT_GRID_SELECT_CELL and wxEVT_GRID_CELL_CHANGE
events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 17:33:22 +00:00
Václav Slavík
af84819372 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 17:08:01 +00:00
Václav Slavík
47e4384c75 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 16:35:43 +00:00
Václav Slavík
8d8bc1bd41 split log.h into GUI and base parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 16:34:19 +00:00
Václav Slavík
e86e15224d many changed to enable multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 16:29:51 +00:00
Václav Slavík
7e8c564c1a split log.h into GUI and base parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 16:28:47 +00:00
Václav Slavík
aa855785a9 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 15:33:22 +00:00
Václav Slavík
4b1e57eb35 regenerated makefiles, with support for multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 15:23:46 +00:00
Václav Slavík
9747f85dad regenerated makefiles, with support for multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 15:13:17 +00:00
Václav Slavík
60c0a8dbf4 fixes to previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 15:09:05 +00:00
Václav Slavík
2de5a6ee23 moved AddFile(wxImage) to GUI part of library, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 14:59:02 +00:00
Václav Slavík
08b3ac36d9 find available samples, demos and contribs at runtime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 14:52:07 +00:00
Václav Slavík
d0ce3e528a compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 14:32:08 +00:00
Václav Slavík
d6b95c13df only define wxUSE_GUI if not already defined; this is needed for multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 14:21:47 +00:00
Václav Slavík
380ba753ff install headers and link against main lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 11:02:02 +00:00
Václav Slavík
fab9850d5d more contrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 11:00:44 +00:00
David Elliott
bf25264013 Changed bool WakeUpIdle() to void to match base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 02:10:36 +00:00
Václav Slavík
fb8ee64d78 added XRC contrib makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:40:06 +00:00
Václav Slavík
6dcc040d57 added first contrib makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:37:46 +00:00
Václav Slavík
a90f1b0b82 different location for contrib bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:26:27 +00:00
Vadim Zeitlin
fcdb9b388a missign app.h header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:13:29 +00:00
Vadim Zeitlin
f98d23fd94 a quick hack to fix wxBase compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:11:34 +00:00
Vadim Zeitlin
c41dbc2085 missing wx/iconloc.h added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:10:07 +00:00
Vadim Zeitlin
4f356748c6 removed #pragma interface because it results in link problems when building wxBase/wxGUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 00:08:31 +00:00
Václav Slavík
c06088650e support for building contrib libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 23:52:06 +00:00
Václav Slavík
6ae02da411 wxBase fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 23:48:18 +00:00
Václav Slavík
6d7d8f3b3b fixes to wxBase compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 23:27:15 +00:00
Vadim Zeitlin
335f20cb00 wxTINY_CAPTION_XXX are obsolete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:47:45 +00:00
Václav Slavík
7f1ed35c26 fixed make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:46:41 +00:00
Václav Slavík
4136b40acc no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:35:14 +00:00
Václav Slavík
04b4031605 renamed julian's private makefile, it's in the way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:31:03 +00:00
Václav Slavík
01aa586397 Mac OS X fixes for ac-2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:23:43 +00:00
Václav Slavík
e90ed8ad58 moving to autoconf-2.5x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:12:12 +00:00
Václav Slavík
481290e226 moved to autoconf-2.5x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:05:29 +00:00
Václav Slavík
e6cc62c672 moving to autoconf-2.5x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 21:56:41 +00:00
Václav Slavík
f70083b694 fixed OSX resources invalid path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 20:13:44 +00:00
Gilles Depeyrot
52ad8c7da7 corrections for compilation under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 20:00:40 +00:00
Gilles Depeyrot
8495ba5368 updated code to not use deprecated methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 19:49:13 +00:00
Gilles Depeyrot
73bdd73aa2 minor corrections for compilation with gcc 3.3 (use cast of address instead
of address of cast)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 19:35:54 +00:00
Václav Slavík
c5ab794840 added Mac resource with icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 18:19:12 +00:00
Václav Slavík
e43fcd5449 added wxART_MISSING_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 18:14:37 +00:00
Václav Slavík
9d830d3ea1 don't compile generic wxMessageDialog w/ GTK+2, it's not used (forgot to commit this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 18:08:02 +00:00
Václav Slavík
55d8199638 regenerated after fixing OSX install_name and adding wxCocoa files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:54:23 +00:00
Václav Slavík
84b001ebab regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:31:31 +00:00
Václav Slavík
910426ee7b compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:29:40 +00:00
Václav Slavík
af515aade5 wxCocoa fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:25:45 +00:00
Václav Slavík
ba28d9bbd5 defined __WXBASE__ when building the monolib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:22:50 +00:00
Václav Slavík
8df6de970d compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:21:42 +00:00
Julian Smart
1882f416e3 Initialised static controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 08:20:05 +00:00
Chris Elliott
0ef7283884 correct library names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 06:34:23 +00:00
Vadim Zeitlin
9a90985d5f added new files (after library split)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 01:36:40 +00:00
Vadim Zeitlin
46446cc2aa compilation fix for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 01:31:22 +00:00
Vadim Zeitlin
153ecbb81c regenerated project/makefiles with tmake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 01:24:12 +00:00
Vadim Zeitlin
505f0a85c9 removed duplicate wxTheApp and m_appInitFn definitions from all ports, not just MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 01:20:33 +00:00
Vadim Zeitlin
e2478fde62 wxBase/GUI separation: 1st step, wxMSW should build, all the rest is broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 00:56:19 +00:00
Václav Slavík
433f5675a9 updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:56:34 +00:00
Václav Slavík
e94a9f4e5b updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:49:09 +00:00
Václav Slavík
cbd63f42f6 generated new makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:42:25 +00:00
Václav Slavík
63dfd606ed compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:32:21 +00:00
Václav Slavík
3c41f265ea updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:31:52 +00:00
Václav Slavík
e8f2f43d12 fix missing files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:31:51 +00:00
Václav Slavík
b9fbba05ef samples configuration didn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:31:51 +00:00
Václav Slavík
fe0895cf82 new build system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:31:50 +00:00
Václav Slavík
7e7336a7e4 fixed missing files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:02:12 +00:00
Václav Slavík
a00348789e depending on Makefile is oversensitive, anybody who changes the make will know to run 'make clean'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 22:00:37 +00:00
Václav Slavík
bce8fed638 wxSelectionStore fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 21:13:27 +00:00
Václav Slavík
6bd5dab592 fixed dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 21:12:56 +00:00
Václav Slavík
7abe18c2ac bakefile build system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 21:12:25 +00:00
Mattia Barbon
a49686b4c2 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 21:06:18 +00:00
Václav Slavík
ddf9896893 moving bakefile build system to the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 19:50:43 +00:00
Vadim Zeitlin
d512306c0b deleted non existing Cancelled() method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 19:47:12 +00:00
Vadim Zeitlin
3ccae3ba9b added missing Skip() in OnIdle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 19:43:27 +00:00
Vadim Zeitlin
fbae49eedf use __VISUALC__ instead of _MSC_VER to avoid problems with CW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 16:04:09 +00:00
David Elliott
ef3e4a2c81 Added #if wxUSE_SLIDER guard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 15:49:11 +00:00
David Elliott
c0e2aaa94a Only MSW has a class wxIconLocation. The other platforms have
typedef wxIconLocationBase wxIconLocation;  Apple's GCC does not like
the mismatch when forward declaring it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 15:27:17 +00:00
David Elliott
c41b649631 Added #ifdef wxHAS_TASK_BAR_ICON guard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 15:17:41 +00:00
Julian Smart
3fc2f8c635 Spelling correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 14:49:46 +00:00
Vadim Zeitlin
da0766ab2a GetIcon() returns wxIconLocation, not wxIcon, now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 13:49:24 +00:00
Julian Smart
80185c6ceb Implemented wxTextCtrl::GetStyle for MSW
Added status bar showing major style attributes at cursor in text sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 13:14:42 +00:00
Vadim Zeitlin
6b7993a952 Fixed typo in cmdline option name; TRUE / FALSE -> {\tt true} / {\tt false} (patch 757770)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 23:02:49 +00:00
Vadim Zeitlin
62313dec27 missing backslash before underscore (patch 758143)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 23:01:11 +00:00
Vadim Zeitlin
3b3fe1f6e7 allow wxFileConfig be created with empty name (will take it from wxApp) (patch 749749)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 22:45:05 +00:00
Vadim Zeitlin
bf43ff9a90 LaTeX2e fixes (patch 748118)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 22:20:40 +00:00
Vadim Zeitlin
55f9f0cbc8 support Show() in wxFlexGridSizer (patch 737850)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 22:08:13 +00:00
Vadim Zeitlin
1b1ca07a70 set selection before setting focus to the control in SetFocusFromKbd() (patch 726361)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 21:56:43 +00:00
Vadim Zeitlin
e1720942b0 fix VC 7.x release build problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 16:13:47 +00:00
Vadim Zeitlin
636773ddad temp fix for link errors after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 15:44:31 +00:00
Vadim Zeitlin
32b38f99ce GNU/Hurd patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 12:48:38 +00:00
Vadim Zeitlin
b3e6525497 added missing default value for pos parameter in ctor/Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 11:04:13 +00:00
Vadim Zeitlin
55d0aaa372 updated after wxFileType change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 00:22:39 +00:00
Vadim Zeitlin
3e3362daa8 added default ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-22 00:19:38 +00:00
Mattia Barbon
3ec4107dfc Add a missing structure definition, move all rich text missing
stuff to wx/msw/missing.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 20:09:14 +00:00
Mattia Barbon
9795182e4a Typo fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 20:06:07 +00:00
Vadim Zeitlin
7c0720183f don't disable hidden windows in wxWindowDisabler, it's at best useless
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 17:45:14 +00:00
Vadim Zeitlin
376ccc457c removed Win16 horrors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 17:38:55 +00:00
Vadim Zeitlin
6feaaaedd6 removed datacmn, not a base file any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 14:09:20 +00:00
Vadim Zeitlin
c07f134693 removed datacmn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 14:08:14 +00:00
Robert Roebling
21b07f95d0 Small fix for splitter window.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 14:07:16 +00:00
Vadim Zeitlin
aaf7ab431b added wxIconLocation; minor fixes to wxIcon on some platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 13:39:40 +00:00
Stefan Neis
75f7af39d1 Reverted patch [ 746201 ] (partially) because of unwanted side-effects
to grids with 0 rows _or_ 0 columns.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 08:40:06 +00:00
Mattia Barbon
7d268a705c Applied patch from William Gallafent to copy manifest at install
time for wxMSW cross compiles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 22:03:43 +00:00
Gilles Depeyrot
ac672b5ae8 corrected DEPFILES which contained an object file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 21:19:21 +00:00
Gilles Depeyrot
c5990c0034 corrected return value of wxTimer::Start when timer is successfully created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 20:48:17 +00:00
Václav Slavík
2269ff5679 fix one of reasons for crash if there is no font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 20:20:16 +00:00
Julian Smart
e00a5d3ca1 Extended wxTextAttr and added wxTextCtrl::GetStyle stub
allow better rich text support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 16:25:31 +00:00
Chris Elliott
f22c3c98a0 relative path to wxwin in samples for Digital Mars (fixes SF bug 757845)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-20 15:20:31 +00:00
Vadim Zeitlin
f561a4e09c removed redundant wxUSE_GUI checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 23:43:01 +00:00
Vadim Zeitlin
a6ab05be98 added __WXBASE__ define; removed duplicated (in wx/chkconf.h) compatibility section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 23:39:51 +00:00
Vadim Zeitlin
a434b43fd4 added wxIsDebuggerRunning() (which is going to replace the mess in log.cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 23:31:19 +00:00
Václav Slavík
53fef662b8 quick and dirty fix for wxMGL compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:33:00 +00:00
David Elliott
c1ff26f55f Removed forced default no for wxUSE_SLIDER and wxUSE_COLOURDLG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:22:15 +00:00
David Elliott
a1725a7205 Added slider.h/slider.mm to wxCocoa build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:18:12 +00:00
David Elliott
bfddb9239f Missed a few substitutions the first time around
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:16:22 +00:00
David Elliott
746aa166e4 Include wxCocoa header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:14:10 +00:00
Václav Slavík
3191ff3b91 added wxHAS_TASK_BAR_ICON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:14:06 +00:00
David Elliott
2ec55dc0be Added wxSlider stub
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:09:27 +00:00
David Elliott
bec1ace627 wxCocoa does not have wxDialog::OnPaint()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:06:24 +00:00
David Elliott
bfec7058d4 Added return NULL; for __WXCOCOA__
FIXME: The platform specific stuff is a real mess


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 21:32:16 +00:00
David Elliott
fc56dc1202 Changed colour.cpp to colour.mm
Also, generated files.lst now has fdlgcmn.cpp included


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 21:30:14 +00:00
David Elliott
d9b4ddf28f Added NSColor declarataion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 21:27:13 +00:00
David Elliott
683b185d01 First stab at wxColour using NSColor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 21:24:10 +00:00
Robert Roebling
7b14c561d9 Font crash and timer fix as per 2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 19:06:06 +00:00
David Elliott
8eabf55943 On wxMac, set the common menubar to the MDI parent and don't show it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 18:22:06 +00:00
David Elliott
3fdac2ab39 In wxApp::OnIdle() check to see if there is not a current menubar and if
there is a common menubar, install it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 18:20:26 +00:00
David Elliott
1b1d2207ea Add ability to have a wxMenuBar as a common menu
- static wxMenuBar::MacSetCommonMenuBar()
- static wxMenuBar::MacGetCommonMenuBar()
- static wxMenuBar::s_macCommonMenuBar;


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 18:17:33 +00:00
Vadim Zeitlin
523c2b8d45 fixed infinite recursion bug in some rare cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 16:55:15 +00:00
Vadim Zeitlin
9f522551db wxUniv compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 09:43:19 +00:00
Chris Elliott
1997b8ba19 fix making base for Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 09:21:07 +00:00
Chris Elliott
572affa49c fix making base for watcom (lib\base and console sample now compile)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 08:13:00 +00:00
Chris Elliott
40bed4b61b fix making base for watcom (lib\base and console sample now compile)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 08:05:26 +00:00
Vadim Zeitlin
32013d27f6 detect EOF better when reading HTTP reply
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 22:09:09 +00:00
Vadim Zeitlin
3cac31513f removed unnecessary #if wxUSE_GUIs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 21:49:40 +00:00
Vadim Zeitlin
c631d59053 removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 21:38:29 +00:00
Vadim Zeitlin
dc6c9679d6 wxComboBox doesn't (officially) derive from wxChoice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 21:36:51 +00:00
Julian Smart
7919cba5b7 Removed very obsolete Set/GetColourMap accessors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 16:19:26 +00:00
Václav Slavík
017b6a0d40 make it possible to not attach toolbars to frames (John Anderson)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 16:17:54 +00:00
Václav Slavík
2f42e5b6bf added --basename and --release flags to wx-config (patch #750815)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 16:08:15 +00:00
Chris Elliott
3eb14b8c98 fix perl commands for makefile.sc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 12:59:17 +00:00
Chris Elliott
7d5848668d fix DMars compilation to use precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 12:09:16 +00:00
Julian Smart
dd27a3bd76 Added extra wxGLCanvas documentation from
Davide Pasquini <davide.pasquini@fastwebnet.it>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 09:20:46 +00:00
Julian Smart
3b13683cad Workaround a crash bug; real solution as yet unknown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 07:41:24 +00:00
Vadim Zeitlin
9ad19a2bde removed a now unnecessary line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 00:42:39 +00:00
Vadim Zeitlin
c8688869d9 better mask handling in wxBitmap to wxImage conversion (patch 754881)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 00:41:37 +00:00
David Elliott
8b389fab25 DEFAULT_wxUSE_TABDIALOG=yes for wxCocoa (Generic notebook)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 20:54:10 +00:00
Vadim Zeitlin
20aed02647 fixed compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 18:09:55 +00:00
Julian Smart
afc5159044 Added 'Go' button for quickly saving setup or configure file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 16:23:49 +00:00
Václav Slavík
d2739ea6db added htlbox to samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 14:27:04 +00:00
Václav Slavík
f30251fb86 added htlbox to samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 14:05:43 +00:00
Chris Elliott
7a9f270ffc modify Borland makefile to include bc in library names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 13:22:34 +00:00
Julian Smart
d9a41dfe5a Renamed Platform -> Target
Bumped version


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 09:55:49 +00:00
Julian Smart
c649a6aba4 Eliminated some code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 09:52:26 +00:00
Chris Elliott
18d491685c add ipc client / server samples for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 09:36:48 +00:00
Chris Elliott
4ce458c74f fix for client / server samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 09:30:10 +00:00
Julian Smart
25b1b442d6 Added corrected Show() to wxPopupWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 08:26:01 +00:00
Robin Dunn
577baeef5a Remove the test for parent window type when checking if to give a
sunken style automatically


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 22:08:01 +00:00
Chris Elliott
be235d0801 initail Digital Mars makefile for stc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 19:35:52 +00:00
Chris Elliott
7832ab4f68 initail Digital Mars makefile for stc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 19:30:19 +00:00
Chris Elliott
bd746613ca faster Borland makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 16:52:26 +00:00
Chris Elliott
0e4c7ab4f2 makefiles for samples for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 16:51:46 +00:00
Julian Smart
01ebf75203 Platform and compiler-specific checking for MSW and Mac now done
in wx/xxx/chkconf.h.
Removed some very obsolete settings, and MSW-specific settings
from Mac's setup0.h.
wxTimer now derives from wxEvtHandler.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 12:31:45 +00:00
Václav Slavík
748418c02b fixed misbehaving selection on some words
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 22:40:12 +00:00
Vadim Zeitlin
29865cc3b9 empty description doesn't look good
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 20:18:03 +00:00
Vadim Zeitlin
d949746098 typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 20:14:57 +00:00
Vadim Zeitlin
817670e454 fixed bug with parsing filter string without description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 20:13:20 +00:00
Vadim Zeitlin
5447d1b493 GTK2 Unicode build warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 20:03:34 +00:00
Vadim Zeitlin
a8f1f1b23b check parmateres in Replace() (bug 752716)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 19:33:04 +00:00
Stefan Neis
5d8f5f875e Added definition of wxUSE_DISPLAY.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 18:36:42 +00:00
Mattia Barbon
24f9edfdae Blind fix for startup crash with Lesstif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 17:27:22 +00:00
Gilles Depeyrot
9711d31ed2 partially applied SF #753787 to correct wx-config --rezflags which was
refering to top build dir instead of install dir


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 08:36:15 +00:00
Julian Smart
0e7bcd61ac Include wxHTML help controller from wx/helphtml.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 19:48:14 +00:00
Julian Smart
bd582574c2 Added wxMenuBase::FindItemByPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 19:44:54 +00:00
Vadim Zeitlin
9505511c59 removed duplicated stuff in Delete() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:55:35 +00:00
Vadim Zeitlin
ef0dd8e517 always NUL-terminate log messages, even if they're longer than buffer size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:45:31 +00:00
Julian Smart
b1f68ca345 Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:44:18 +00:00
Julian Smart
eac703e9c5 Made XPMs transparent
Corrected wxMessageBox usage


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:42:40 +00:00
Vadim Zeitlin
27db95f054 speed up for debug mode startup (doesn't matter much but as it doesn't cost anything to fix this...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:36:08 +00:00
Julian Smart
e776786754 Added Find dialog
Bumped version to 1.01


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:25:26 +00:00
Julian Smart
8cb4919bd4 Added configtool to configure and Makefile.in
Added -lsupc++ to end of LDLIBS to avoid link errors


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:18:39 +00:00
Julian Smart
02ae000a99 Removed compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 16:04:11 +00:00
Vadim Zeitlin
de89696245 regenerated using tmake to add fldlgcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 13:39:10 +00:00
Vadim Zeitlin
b600ed1362 wxFileDialog cleanup, extracted common code to fldlgcmn.cpp (patch 754187)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 13:31:49 +00:00
Vadim Zeitlin
30e671a59f added virtual dtor to wxDateTimeHolidayAuthority (patch 753947)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 13:23:56 +00:00
Vadim Zeitlin
3080bf599a added a few #ifdefs needed to build a smaller library (patch 751523)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 13:00:55 +00:00
Vadim Zeitlin
095980e182 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 13:00:31 +00:00
Vadim Zeitlin
1e74d03b7f implemented alpha support for raw bitmaps under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 12:57:44 +00:00
Julian Smart
059d039e1e Small updates to wxCT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 09:29:45 +00:00
Chris Elliott
52bd669655 fix some more samples for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-14 08:48:42 +00:00
Václav Slavík
9b24b388c1 compilation fix for platforms w/o wxRawBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 23:25:09 +00:00
Vadim Zeitlin
4636a1e8f8 no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 22:32:23 +00:00
Vadim Zeitlin
de5d3a20ce SetSelection() may be used for both single and multi selection listboxes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 22:30:55 +00:00
Vadim Zeitlin
9a9b4940a1 added possibility to customize the listbox colours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 22:26:45 +00:00
David Elliott
6874238c54 Include wx/file.h even when using precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 21:32:07 +00:00
David Elliott
c500250d39 * Added gsockcocoa.c to files list
* Regenerated files lists, wxCocoa now includes selstore


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 21:28:45 +00:00
David Elliott
d533381ebc Added GSocket stubs for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 21:19:49 +00:00
David Elliott
c8cae94c72 Use the new wxNSStringWithWxString conversion function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 21:15:04 +00:00
David Elliott
724ebdde8a Added wxString to NSString conversion functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 21:09:21 +00:00
Chris Elliott
f4bf676380 fix some more samples for digital mars [allow contrib to work]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 20:30:52 +00:00
David Elliott
70024cfb08 Proposed wxMac MDI interface (in limbo)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 20:29:48 +00:00
Chris Elliott
31bb77da45 fix some more samples for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 20:26:54 +00:00
David Elliott
245f35816d Added support for delayed deactivation of windows (for MDI)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 20:24:32 +00:00
Vadim Zeitlin
0063c16999 documented all methods pertaining to the multiple selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 19:21:37 +00:00
Julian Smart
ea723360ee Fixed MDI scrollbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 18:56:53 +00:00
Chris Elliott
b8f34efb02 add dmc makefile (samples compile and run OK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 18:43:35 +00:00
Chris Elliott
b911bc32a1 fix for dmc compilation of projects with more than one obj
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 18:39:45 +00:00
Vadim Zeitlin
5d6dcfb327 added RefreshLine(s), HitTest() and IsVisible()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 17:18:28 +00:00
Vadim Zeitlin
ceb71775b4 added def value for Create() id parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 17:17:46 +00:00
Vadim Zeitlin
d5eddfef2e quote '|' inside regexes (fixes dump mode); fixed crash due to strange HelpGenApp code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 17:05:43 +00:00
Vadim Zeitlin
71b5725f30 fixed bug in group counting Compile()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 17:02:29 +00:00
Vadim Zeitlin
09c6a817fa collected all deprecated methods in the beginning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 16:38:09 +00:00
Vadim Zeitlin
87a36e90d4 mention wxMac THUMBRELEASE bug fix and wxHtmlLbox &c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 16:30:14 +00:00
Vadim Zeitlin
6ed71b4f20 send wxEVT_SCROLLWIN_THUMBRELEASE events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 16:25:10 +00:00
Václav Slavík
ce73e65400 fs_inet depends on protocol classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 15:33:14 +00:00
Vadim Zeitlin
14b6653cc1 compilation fix for PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 15:24:40 +00:00
Vadim Zeitlin
33a037495e fixed off by 1 bug in SelectRange()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 13:29:52 +00:00
Vadim Zeitlin
5f73281084 added commands to toggle multiple selection and to select all items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 13:23:49 +00:00
Vadim Zeitlin
970b97a267 made multiple selection behave more consistently with the usual (Windows) way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 13:09:30 +00:00
Vadim Zeitlin
b0126f6094 regenerated all make/project files to include selstore.cpp/.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 13:06:51 +00:00
Vadim Zeitlin
6c9210a76a added checks for the item index
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 12:42:35 +00:00
Julian Smart
f8105809ef Some fixes for gcc compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 12:20:33 +00:00
Julian Smart
7c5ece9e3c Small fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 10:56:26 +00:00
Julian Smart
99f03ce9c7 Merged some info from the 2.4 branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 10:30:03 +00:00
Václav Slavík
4a6e4a46a3 added wxLocale::GetLanguageName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 10:16:19 +00:00
Julian Smart
6e16f8693f Added DialogBlocks file for configtool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-13 09:08:39 +00:00
Julian Smart
d7463f75f9 Added first cut wxWindows Configuration Tool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 20:43:55 +00:00
Robin Dunn
f2c3db9d7d Patch #753465 a fix for Bug#750363.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 18:53:42 +00:00
Václav Slavík
854e189f90 added wxRTTI to XRC handlers (patch #752996 by David Falkinder)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 18:10:38 +00:00
Václav Slavík
71ff7c911a fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 16:15:26 +00:00
Chris Elliott
cc693a8200 fix Borland makefile as per 2 recent bug reports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 15:23:25 +00:00
David Elliott
be7a101366 Make wxMDIParentFrame a regular top level window
- Override DoGetClientSize for wxMDIClientWindow instead of wxMDIParentFrame
- Do not override OnSize for wxMDIParentFrame


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 13:41:05 +00:00
Chris Elliott
b478e7a71c fix Borland makefile for xrc as per SF report 747099
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 12:32:22 +00:00
Jouk Jansen
c698eae5a8 Committing in .
OpenVMS compile issues

 Modified Files:
 	wxWindows/include/wx/vms_x_fix.h
 	wxWindows/samples/image/image.cpp
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/motif/clipbrd.cpp
 	wxWindows/src/motif/combobox.cpp
 	wxWindows/src/motif/scrolbar.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 11:28:16 +00:00
Vadim Zeitlin
4c38c20777 added missing selstore.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-12 08:54:28 +00:00
Vadim Zeitlin
973e686595 fixed warnings about assigning literal strings to char *
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 22:21:42 +00:00
Vadim Zeitlin
75240db295 WriteString() doesn't append EOL automatically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 22:02:05 +00:00
Vadim Zeitlin
ac53090cb7 don't ignore wxLC_NO_HEADER style when inserting first column
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 21:58:55 +00:00
Gilles Depeyrot
2d3441d7e5 applied SF patch #752538 to implement wxGetOSDirectory() for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 18:17:56 +00:00
Chris Elliott
8adeb85117 fix SF bug report 751351
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 14:44:43 +00:00
Julian Smart
1be9536aaa Allow for multiple CHM controllers in app (don't leak dynamic libs)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 14:15:36 +00:00
Vadim Zeitlin
d8a01976c0 trigraph warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 12:18:46 +00:00
Vadim Zeitlin
8613d47ba9 multi selection test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:55:06 +00:00
Vadim Zeitlin
43e319a307 removed countItems parameter from ctor -- doesn't work anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:47:09 +00:00
Vadim Zeitlin
be46555538 implemented multiple selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:40:37 +00:00
Vadim Zeitlin
ae0f022346 added RefreshLines()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:37:52 +00:00
Vadim Zeitlin
e135f09367 removed duplicate code from SetData(), just call AddData()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:36:45 +00:00
Vadim Zeitlin
d659d703ef made CopySelection() always available (otherwise it wouldn't compile when wxUSE_CLIPBOARD == 0); copy double/triple clicked selection to primary X11 clipboard under Unix as well; minor code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:34:44 +00:00
Vadim Zeitlin
63b8dd39b8 merged the confllict resolution (I've fixed the m_format bug independently); no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:34:26 +00:00
Vadim Zeitlin
86ff9b45d9 a hack to make copying double clicked words to clipboard work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:33:48 +00:00
Julian Smart
4f610b3443 Add back #endif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:11:34 +00:00
Vadim Zeitlin
b3005659bd made GetType() inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:02:04 +00:00
Vadim Zeitlin
ef5cfa3889 added selstore.(h|cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:00:09 +00:00
Vadim Zeitlin
c71d3313a4 extracted wxSelectionStore in a separate file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 10:49:53 +00:00
Vadim Zeitlin
210c92a367 try to determine the correct SOCKLEN_T value harder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 10:48:43 +00:00
Julian Smart
dd74a7ad67 Removing vestiges of wxUSE_NEW_GRID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 10:03:57 +00:00
Stefan Csomor
4ab107d7f1 corrected error in last fix for insert items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 08:34:07 +00:00
Robin Dunn
1e93ca1729 Ensure that a wxMenuItem's parent menu is updated if it is removed
from one and added to another menu.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-10 23:48:46 +00:00
Václav Slavík
13fd234c9c fixed Content-Type lookup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-10 21:23:53 +00:00
David Elliott
cbe13a1f09 Apple #pragma implementation fix (Yes, some of us do compile wxGTK on OS X)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 18:33:02 +00:00
Stefan Neis
75625d796c Fixed Refresh to clip update rectangles to the visible area of a
(scrolled) window. If there are many invisible/partly visible
        rectangles in the update region GTK+-1.2.10 starts complaining
        about bad match errors and soon crashes.
Change corresponds to changes on WX_2_4_BRANCH from 1.408.2.21 to 1.408.2.24.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 18:27:31 +00:00
Stefan Neis
542e68c719 Moved include to wx/module.h out of #ifndef WX_PRECOMP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 17:33:39 +00:00
Václav Slavík
f9ba645e5d compilation fix for VisualAge C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 17:06:40 +00:00
Stefan Neis
e7262344d0 Moved include to wx/module.h out of #ifndef WX_PRECOMP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 16:35:12 +00:00
Stefan Neis
33c6ae1d81 Fixed typos as reported by Adrian Gschwend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 16:27:04 +00:00
Julian Smart
1c84423290 Only bring the window to the top in Show() if we're a top-level
window, else we mess up z-order/tab order


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 23:56:27 +00:00
Stefan Csomor
76158d52be corrected include for Apple's Dev Tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 21:39:33 +00:00
Mattia Barbon
dc0cecbcc9 wxMessageDialog and ::wxMessageBox don't support wxCENTRE: remove
it from documentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 18:20:24 +00:00
Julian Smart
44cf9b50ee Added shaped sample copying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 17:49:49 +00:00
David Elliott
6444e22daa Restored Objective-C typesafety while retaining proper C++ name mangling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 03:25:42 +00:00
David Elliott
085c39b402 Mention RFC 1738, in particular file://hostname/path/to/file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-08 01:58:10 +00:00
Václav Slavík
77bae5e228 use 'I' cursor when over text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 23:31:21 +00:00
Stefan Csomor
493ac0b8b5 GetId was accessing the m_format var incorrectly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 21:55:19 +00:00
Stefan Csomor
2f64c3bb23 Accepts Focus was incorrectly returning FALSE for a panel w/o children on mac because of the two implicit scrollbars...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 21:40:32 +00:00
Stefan Csomor
ac2153a686 cast correction Profiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 21:04:00 +00:00
Stefan Csomor
383cbf1320 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 21:02:06 +00:00
Stefan Csomor
4b26b60fac MacHandleControlClick extended by mouseStillDown state for supporting things like THUMBRELEASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 20:58:38 +00:00
Stefan Csomor
e71a0aa95f changing inheritance and delegation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 20:34:29 +00:00
Stefan Csomor
69b85ca49b adapting MacHandleControlClick to know about mouse state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 20:29:57 +00:00
Robin Dunn
3ba18664fc revert my last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 15:54:41 +00:00
Vadim Zeitlin
b1043cdc3c printf() format warrning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 14:39:15 +00:00
Julian Smart
4603b4f92f Applied patch [ 748638 ] wxDos2UnixFilename for unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 13:55:43 +00:00
Julian Smart
f9007c324c Reports suggest that _sometimes_ WS_VSCROLL/WS_HSCROLL
are needed. So map wxVSCROLL/wxHSCROLL to these.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 13:22:34 +00:00
Vadim Zeitlin
c60a36d5dd DoGiveHelp() should be defined even if !wxUSE_STATUSBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 12:40:34 +00:00
Vadim Zeitlin
253fe8ab4b no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 11:19:28 +00:00
Roger Gammans
fd3d753463 Make changes to configure to fix mbug noted by David Elliot .
(fix is based on david's patch ).
 Add odbc library status to the summary provided by configure.

 Fix typo it prologio test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 10:52:20 +00:00
Julian Smart
6613474976 Typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 10:12:53 +00:00
Julian Smart
91f2c1540f Fix for [ 748805 ] Assert failure for specified situation in samples/controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 09:59:38 +00:00
David Elliott
6ce5198539 Place m_lastDoubleClick initialization inside existing #if wxUSE_CLIPBOARD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 02:20:20 +00:00
David Elliott
49de49497d Added #if wxUSE_DATAOBJ guard around header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 02:16:44 +00:00
David Elliott
be65775665 Added stub for the new pure virtual DoInsert method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 01:38:13 +00:00
David Elliott
11c084163e include "wx/module.h" for wxModule
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 01:34:17 +00:00
Robin Dunn
58751a8685 fix so wxMenu::InsertItem actually inserts rather than overwrites
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 23:46:36 +00:00
Robin Dunn
c69279ef70 Just silently return NULL like the other ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 23:15:50 +00:00
Robin Dunn
88b1cfb651 Don't get picky about unicode mode. Scintilla doesn't set the mode
for calltip windows anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 21:34:00 +00:00
Julian Smart
9275167db0 Include module.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 16:32:40 +00:00
Vadim Zeitlin
3195dca76c typo in the event type name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 15:40:15 +00:00
Julian Smart
3885ccc54a Fixed usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 10:46:59 +00:00
Robin Dunn
8760bc6529 Put terminating NUL in the buffer since MB2WC doesn't do it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-06 00:43:21 +00:00
Václav Slavík
161a87e614 added wxHW_NO_SELECTION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 21:33:56 +00:00
Václav Slavík
a689b6d6dd documented wxHW_NO_SELECTION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 21:32:56 +00:00
Julian Smart
f080251d92 Reverted the warning fix since it breaks MinGW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 20:33:17 +00:00
Václav Slavík
0994d9683e added line selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 20:30:56 +00:00
Václav Slavík
13bf5a8231 added text selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 20:30:22 +00:00
Mattia Barbon
2b2309a466 Add missing header for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 18:11:45 +00:00
Julian Smart
a9fa99ad9e Fixed compile warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 16:08:40 +00:00
Julian Smart
04eb05b01e Disable non-standard notebook styles if CommCtl doesn't support them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 13:35:50 +00:00
Julian Smart
34aa61407a Fixed bug [ 749471 ] wxDocument with no command processor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 12:03:47 +00:00
Julian Smart
f032bf3d16 Fixed native dialog bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 10:57:59 +00:00
Václav Slavík
31eefb998d doubleclick selects word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 21:42:34 +00:00
Stefan Csomor
595ec11a45 casts correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 21:26:50 +00:00
Stefan Csomor
f81bfef982 moving / sizing patch applied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 21:16:43 +00:00
Stefan Csomor
65334b43fe support undo patch applied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 21:14:16 +00:00
Václav Slavík
091f0dc759 wxHtmlWindow uses double buffering now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 19:03:56 +00:00
Václav Slavík
1338c59a02 added selecting-while-dragging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 18:17:04 +00:00
Julian Smart
8ca3dfcdfa Don't divide by zero.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 12:53:03 +00:00
Vadim Zeitlin
b6d5d4548c made wxNativePixelFormat usable under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 00:50:18 +00:00
Vadim Zeitlin
77a4354e85 compilation warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 00:49:18 +00:00
Václav Slavík
bfc248a3f9 fixed bug in selection style if selection colours is not constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 00:18:22 +00:00
Václav Slavík
285f58ab66 new rendering customization api fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:32:10 +00:00
Vadim Zeitlin
5de2429102 documented RefreshAll()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:24:01 +00:00
Vadim Zeitlin
901b583c71 compilation fixed after recent wxHTML changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:13:41 +00:00
Vadim Zeitlin
70bae0166c signed/unsigned comparison warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:10:51 +00:00
Václav Slavík
a99798d20c (hopefully) finished subcell selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:07:52 +00:00
Václav Slavík
f30e67dbea new rendering customization API for Vadim
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:04:59 +00:00
Vadim Zeitlin
0ea0359bca don't ignore cache hints with from == to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 21:22:35 +00:00
Václav Slavík
ed9d5d17e1 new rendering customization API for Vadim
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 21:22:08 +00:00
Stefan Csomor
ace07c80ba feeds missed key events back to the control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 20:32:59 +00:00
Stefan Csomor
0154fd2c88 correcting lookup of equal names in different modules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 20:21:12 +00:00
Vadim Zeitlin
3964e424bf fixed the channel order for Mac (alpha comes first)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 18:52:57 +00:00
Vadim Zeitlin
091c90b7cb no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 18:49:49 +00:00
Vadim Zeitlin
05a0787179 Mac compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 18:47:53 +00:00
Julian Smart
5ed4c021dd Phase 2 of line ending conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 16:32:30 +00:00
Julian Smart
00ffaa4c96 Phase 1 in converting line endings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 16:30:18 +00:00
Julian Smart
bfcbd20ff2 Fix for bug [ 748171 ] Can't compile contrib/samples/fl/fl_demo2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 16:19:39 +00:00
Václav Slavík
169ee861bd subcell selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:56:43 +00:00
Václav Slavík
5a1597e9ef subcell selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:48:59 +00:00
Vadim Zeitlin
e87fb0ee85 added missing module.h include (bug 748158)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:19:21 +00:00
Vadim Zeitlin
5a0b749487 removed absolutely unneeded #include module.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:17:36 +00:00
Julian Smart
b4f1a309b7 Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 12:44:16 +00:00
Vadim Zeitlin
0b49ccf8d6 pressing PageDown and then PageUp should return to the same item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 11:15:38 +00:00
Vadim Zeitlin
e7546115db Unicode compilation fix (patch 747959)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 10:55:47 +00:00
Vadim Zeitlin
f124ddf450 use c_str() instead of mb_str() with wxString::Printf() (patch 747903)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 10:51:52 +00:00
Vadim Zeitlin
a67e6e5438 generate wxEVT_COMMAND_LIST_INSERT_ITEM (patch 747070)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 10:46:08 +00:00
Vadim Zeitlin
8d85bf5c58 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 10:41:49 +00:00
Vadim Zeitlin
17be85312c fixed wxPenRefData::operator==() (part of patch 742783)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 10:32:26 +00:00
Vadim Zeitlin
55e18dbe2f initial attempts to get raw bitmaps working under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 00:44:43 +00:00
Vadim Zeitlin
eb7f8ac545 fixed compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 00:44:10 +00:00
Václav Slavík
e24529d70d another bug fixed: wrong lookup of nearest cell before given point
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:35:26 +00:00
Vadim Zeitlin
4ce19ed7aa compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:05:22 +00:00
Vadim Zeitlin
c9c61efbdd compilation warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:03:56 +00:00
Vadim Zeitlin
5ecdc7ab6d refresh cache on size/margins change; expanded cache to contain N elements, not just one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:02:12 +00:00
Vadim Zeitlin
6af4ea87d0 added GetMargins()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:00:35 +00:00
Vadim Zeitlin
4760fa9109 test popup menu help strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:59:37 +00:00
Vadim Zeitlin
8b053348a5 added RefreshAll()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:58:38 +00:00
Vadim Zeitlin
fb4769829b test for setting caret size and more changes (details are hazy; should have been committed a couple of months ago)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:57:03 +00:00
Vadim Zeitlin
7fd4e7e1c2 attempt to fix gcc printf() warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:50:12 +00:00
Vadim Zeitlin
82922a02d8 fixed calculations in SetMapMode() (use FP division, not integer)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:41:44 +00:00
Vadim Zeitlin
2da34e7d9e updated after grid samples removal/renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 22:29:13 +00:00
Vadim Zeitlin
3c907f20e4 regenerated after --enable-resources/prologio and wxUSE_X_RESOURCES changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:54:22 +00:00
Vadim Zeitlin
b52e49f51c fix for gcc 3.3 warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:46:31 +00:00
Vadim Zeitlin
b6de9890a4 removed wxUSE_X_RESOURCES -- was unused anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:44:55 +00:00
Vadim Zeitlin
1b86c3ac37 give error if --enable-prologio/resources were given -- this is better than ignoring them silently
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:41:26 +00:00
Václav Slavík
e377412473 added copying selection to clipboard; fixes to selection making
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:21:23 +00:00
Roger Gammans
cf6ae2907c Addition at simple wxObject*, support into wxVariant.
This includes 2 new methods wxVariant::IsValueKindOf() and
wxVariantData::GetValueClassInfo() to allow query of the
wxRTTI data of the variant's data.

Also included is a macro analogues to dynamicCast for fetching
objects out of a wxVariant.

Documentation patches for the above.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:17:28 +00:00
Roger Gammans
8647bec62d Change '--with-odbc' to use the WX_ARG_SYS_WITH macro instead of
the WX_ARG_WITH macro. Add some extra rules to find the new correct
linker flags.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:09:53 +00:00
Václav Slavík
61233023a0 added copying selection to clipboard; fixes to selection making
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 20:14:31 +00:00
Vadim Zeitlin
bb178b2971 compilation fixes for !USE_PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 17:29:40 +00:00
Vadim Zeitlin
6170c108a1 printf() format warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 17:27:57 +00:00
Julian Smart
85b43fbf7a Attempt to make wxWindows play better with XP themes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 10:27:03 +00:00
Václav Slavík
73bab6b44d attempt to fix first click problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 23:17:08 +00:00
Vadim Zeitlin
6d41981d89 compilation fix (not all paths returned a value)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 22:33:06 +00:00
Václav Slavík
adf2eb2d34 more work on text selection: selecting should work now, but there's no clipboard interaction yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 22:19:15 +00:00
Vadim Zeitlin
7fb8086de8 fixed broken English...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:25:08 +00:00
Julian Smart
e415391a4e Notify -> NotifyEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:24:57 +00:00
Vadim Zeitlin
53ae92099f fixed broken TeX markup which resulted in broken links
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:20:07 +00:00
Julian Smart
feb6856235 Fixed doc bug [ 733128 ] 'wxTaskBarIcon.PopupMenu(..)' missing doc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:11:16 +00:00
Julian Smart
8da336ebe1 toback24 for Raise() fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:03:22 +00:00
Julian Smart
313901f3e5 Fix for bug [ 744199 ] wxBringWindowToTop, child window z-order
A child window should only have it's z-order raised, not
the parent window brought to the front.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 21:01:18 +00:00
Julian Smart
e00865fab6 Get the initialization order right.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 20:47:50 +00:00
Julian Smart
7ac4c27aa6 Pass focus window to submenu items too (no reason I can think of not to).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 20:40:09 +00:00
Julian Smart
c377f1bef4 Added submenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 20:35:12 +00:00
Julian Smart
c546974fbf Fixed bug [ 743664 ] wxListCtrl asserts when deleting its m_textCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 20:12:30 +00:00
Julian Smart
65b683fd1b Fix for [ 688754 ] wxNotebook::SetSelection(-1) will segfault
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 19:41:50 +00:00
Julian Smart
272995af2c Fix (I hope) for bug [ 673862 ] printing zero length string with postscript does not work
Now descent and externalLeading will be zeroed if the string is empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 19:23:16 +00:00
Julian Smart
3aabb24c08 Applied bug fix [ 684949 ] Dialup Sample With Borland C++ 5.5.1 Free Compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 19:06:30 +00:00
Gilles Depeyrot
c038ecc666 ignore MSVC build output directories
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 18:17:50 +00:00
Julian Smart
f67db8c002 Removed AlignIn after further thought
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 17:15:38 +00:00
Julian Smart
605dfd9173 Applied patch [ 650511 ] wxCalendarCtrl - year does not change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:46:49 +00:00
Julian Smart
920b9675d9 Applied patch [ 735304 ] wxDisplay::ChangeMode - does not resize full-screen windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:32:59 +00:00
Julian Smart
fca36d9a03 Applied patch [ 735948 ] wxStaticPicture contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:26:58 +00:00
Julian Smart
c8e4fa8b2d Applied patch [ 719667 ] Ownerdrawn Buttons without wxUSE_OWNER_DRAWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:16:41 +00:00
Julian Smart
939fadc8aa Applied patch [ 710608 ] wxImage::GetImageExtWildcard for image load/save dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:10:17 +00:00
Julian Smart
b1b3ddd840 Applied patch [ 649157 ] wxDisplay for Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 16:03:24 +00:00
Julian Smart
a89abd7f0c Applied patch [ 730697 ] wxRect::AlignIn member
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:53:00 +00:00
Julian Smart
22328fa444 Applied patch [ 623187 ] virtual methods and new AppendItem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:48:42 +00:00
Vadim Zeitlin
b544a27802 a workaround for Mac update problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:48:10 +00:00
Julian Smart
0d1cb8cb29 Applied patch [ 619386 ] uxtheme.dll support
with filename changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:18:36 +00:00
Vadim Zeitlin
5be55d562f compilation warnings fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:16:07 +00:00
Vadim Zeitlin
550e6c014c compilation fix for Mac and reformatted the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 15:15:09 +00:00
Julian Smart
5706de1cf4 Partially applied patch [ 531199 ] new EVT_MOVING and EVT_SIZING
Changed to reuse wxMoveEvent, wxSizeEvent
Only applied the Mac part as a TODO comment


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 14:37:28 +00:00
Julian Smart
5c5428f913 Applied patch [ 619539 ] patch to get small icon via geticon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:57:23 +00:00
Julian Smart
ef094fa075 Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:50:55 +00:00
Julian Smart
7408cf7f76 Applied patch [ 739063 ] window.cpp (gtk) - mouse event processing
x -> y


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:45:54 +00:00
Julian Smart
fb47b99f25 Applied patch [ 735588 ] Gtk2 textctrl selection fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:42:21 +00:00
Julian Smart
eaf6274cc0 Applied patch [ 733425 ] Fix for header rendering problem in CalCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:39:30 +00:00
Vadim Zeitlin
201ca87982 added wxHtmlListBox sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:38:45 +00:00
Vadim Zeitlin
e0c6027b5a added wxVListBox using wxVScrolledWindow and wxHtmlListBox using it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:35:26 +00:00
Václav Slavík
6fac75c355 added default ctor and SetSelection to wxHtmlRenderingState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:28:09 +00:00
Julian Smart
17816c2e70 Applied patch [ 743194 ] HitTest for wxNotebook
Yes, we do need implementations for other platforms,
but it's a start.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:26:09 +00:00
Julian Smart
eee3624b11 Applied patch [ 743248 ] wxArray::RemoveAt() error message fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:21:40 +00:00
Julian Smart
0e4cfcdd77 Applied patch [ 743471 ] wxSplitter::Unsplit fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:19:56 +00:00
Julian Smart
32923e21c7 Implemented wxNotebook::DoGetBestSize so Fit now works.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:14:51 +00:00
Julian Smart
2ce7af354a Applied [ 745533 ] implemented wxNotebook::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:13:03 +00:00
Julian Smart
4611305399 Applied patch [ 745983 ] Fix for memory leak in class wxPluginManager in dynload.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:58:30 +00:00
Julian Smart
4ea3479cb5 Applied [ 746201 ] wxGrid row/col change not updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:55:59 +00:00
Julian Smart
233a54f6af Applied patch [ 746203 ] xwGrid::SetTable may be called multiple times
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:51:06 +00:00
Julian Smart
12491c1f8e Applied patch [ 746355 ] Adds some checks for chkconf.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:46:22 +00:00
Julian Smart
392c714810 Applied patch [ 746547 ] fixes 'wrong header file included' in fontmap.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:42:49 +00:00
Julian Smart
f43084de97 Applie dpatch [ 741366 ] wxMac d'n'd fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:41:00 +00:00
Julian Smart
dab7302127 Added BCC include dir in XRC makefile
Typo correction in app.tex


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 12:34:12 +00:00
Václav Slavík
cd275246d3 fixed UpdateRenderingState to do what it was meant to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 11:19:13 +00:00
Vadim Zeitlin
7d96264c68 added consts needed by VC++/BC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 10:25:23 +00:00
Václav Slavík
31d8b4ad24 react on mouse up, not mouse down
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 00:10:06 +00:00
Václav Slavík
3033131651 oops, commited debugging code by mistake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 21:51:17 +00:00
Václav Slavík
36c4ff4d65 preparing wxHtmlWindow for text selection (highlighting works, mouse input and clipboard does not)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 21:48:50 +00:00
Václav Slavík
f65a786ffd preparing wxHtmlWindow for text selection (highlighting works, mouse input and clipboard does not)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 21:42:13 +00:00
Václav Slavík
13005f1d1e backport gtk2 fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 18:07:20 +00:00
Václav Slavík
76b204675b support SetBackgroundMode and SetTextBackground with GTK+2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 17:30:00 +00:00
Vadim Zeitlin
e6173e54a0 back port wxPanel focus fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 17:26:45 +00:00
Vadim Zeitlin
a7407834c4 clicking on a panel without children should give it the focus (closes 215436)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 17:25:07 +00:00
Vadim Zeitlin
e16f8973cd corrected MakeLower/Upper() return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 15:10:56 +00:00
Vadim Zeitlin
af9fe8874f missing WXDLLEXPORT added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 12:04:34 +00:00
Vadim Zeitlin
4a7ec775fe typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:40:57 +00:00
Vadim Zeitlin
738fc94287 changed vscroll.cpp file location
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:28:38 +00:00
Vadim Zeitlin
75bff3be85 added {Line/Page}{Up/Down}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:20:25 +00:00
Vadim Zeitlin
2a70e6eb3f bad link fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:17:56 +00:00
Vadim Zeitlin
c9bf76f73d LaTeX error fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:16:04 +00:00
Vadim Zeitlin
cf7d632953 added wxVScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 21:08:31 +00:00
Vadim Zeitlin
95ac740c3b minor fixes to workspace/project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 20:36:16 +00:00
Julian Smart
13c4e406d3 Wrap missing.h in #ifdef __GNUG__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 13:29:10 +00:00
Vadim Zeitlin
aedcc0dc82 compilation fix for yet another broken version of mingw (ENSESSION_LOGOFF not defined)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 13:23:55 +00:00
Vadim Zeitlin
7863fab40d #define WINVER as 0x400 if it is not defined at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-30 00:13:20 +00:00
Robin Dunn
51566b0bc9 Added LoadFile and SaveFile methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-29 23:50:21 +00:00
Robin Dunn
feddd867de fix a precedence order problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-29 20:30:54 +00:00
Stefan Csomor
55da8bd1e1 GetEventHandler()-> was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-29 19:02:04 +00:00
Gilles Depeyrot
f1317a5d94 fixed error in inlined (standard) version of wxStringData deallocation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-29 15:59:46 +00:00
Gilles Depeyrot
8ecf21b7db improved deallocation fix for Visual C++ Multithreaded non DLL runtime
so that it only has a performance impact on wxString in this configuration


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-29 14:03:37 +00:00
Gilles Depeyrot
ca5e07c768 VC++ free must take place in same DLL as allocation when using non dll
run-time library (e.g. Multithreaded instead of Multithreaded DLL)
we must not inline wxStringData deallocation since allocation is not inlined


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-28 21:11:17 +00:00
Roger Gammans
ff818ab87b Reinsert missing ctor removed in date/time tidy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-28 20:48:40 +00:00
Gilles Depeyrot
e8ca710507 allow wxDisplaySize to be called with NULL parameters
implement GetMetric for wxSYS_SCREEN_X & wxSYS_SCREEN_X using wxDisplaySize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-28 18:46:32 +00:00
Vadim Zeitlin
eb382f3e5e force wxUSE_IOSTREAMH to 0 with VC 7.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 22:04:50 +00:00
Mattia Barbon
6c33b24c53 Derive wxScrollBar from wxScrollBarBase, plus miscellaneous
refactoring. Adjusted default scrollbar size to match the
size of wxScrolledWindow (and other scrolled controls) scrollbars.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 20:36:31 +00:00
Mattia Barbon
c8ec0b3d36 Allow initialising wxStaticBitamp with wxNullBitmap/wxNullIcon,
automatically resize the control to match the bitmap (as wxMSW does).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 20:34:13 +00:00
Mattia Barbon
ffa3d6b8a3 Removed some duplicated code, made wxCursor( wxImage )
handling of dark/light colors agree with wxMSW and wxGTK, i.e.
dark -> black, light -> white.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 20:31:41 +00:00
Mattia Barbon
d7c40406e6 Don't leave the wxStaticBox hanging around after wxStaticLine
destruction.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 20:28:51 +00:00
Chris Elliott
e6275f8d02 Borland makefiles for contrib keeping output apart
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 13:43:30 +00:00
Jouk Jansen
dc3b0532ee Committing in .
OpenVMS complie issues
 +
 src/generic/statline.cpp : setup should be runned before first #ifdef

 Modified Files:
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/generic/statline.cpp
 	wxWindows/src/motif/descrip.mms wxWindows/src/x11/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-27 06:09:38 +00:00
Julian Smart
983d2e1414 More style fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 22:59:24 +00:00
Julian Smart
e0b9ad2982 Further border style corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 22:15:25 +00:00
Gilles Depeyrot
245abf09bf ignore dll build output directories
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 20:41:36 +00:00
Julian Smart
3fcea4b10b Include missing.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 19:25:15 +00:00
Václav Slavík
96aba1e942 clarify using embedded XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 16:20:54 +00:00
Chris Elliott
2cedc12a6a Borland makefiles now keep output apart
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 11:34:39 +00:00
Chris Elliott
ba0d56c3c2 fix SF bug 742496
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 10:23:03 +00:00
Julian Smart
a5ae8241de Allow printing objects to be passed a wxWindow, not a wxFrame
(vestigial remains of older wxWin version)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 09:55:28 +00:00
Chris Elliott
9f6df75d32 dialogs sample now works with digitalmars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 09:17:31 +00:00
Vadim Zeitlin
a9103a81be fix m_Matches overflow if Compile() is called more than once (bug 742236)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-25 20:28:01 +00:00
Václav Slavík
7df93c2deb fix _() for wxUSE_INTL==0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-25 11:18:28 +00:00
Václav Slavík
c53207a546 added CompareAccelString function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-25 11:18:13 +00:00
Vadim Zeitlin
90985bdec4 added a link to the Wiki page explaining MSVC++ install process
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 22:27:36 +00:00
Stefan Csomor
c69e74885f guarded M_PI declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 21:31:29 +00:00
Mattia Barbon
a5f0148111 Removed obsoleted files from vc.t.
Regenerated some makefiles/project files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 20:23:12 +00:00
Mattia Barbon
29d0a26e65 Compilation/warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 20:07:22 +00:00
Mattia Barbon
7bb2947d52 Added --enable-accessibility switch to configure
(off by default). Fixed makefile for the accessibility
sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 20:06:46 +00:00
Mattia Barbon
a538c1c36f wxMotif now uses src/x11/region.cpp, change makefiles accordingly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 20:01:32 +00:00
Mattia Barbon
148b44a1e7 Used wxRegion code from wxX11.
Removed update rect list from wxWindow
(not necessary anymore).
  Simplified and corrected clipping region handling
in wxWindowDC. Stopped wxWindowDC::DoBlit from
destroying the clipping region.
  Simplified wxPaintDC code.
Added wxWindow::DoCreateScrollBar helper function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 19:41:05 +00:00
Julian Smart
69108ccb4e Removed wxHTMLHelpControllerBase (putting the
implementation into wxExtHelpController.
wx/helphtml.h now includes wx/html/helpctrl.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 11:20:39 +00:00
Stefan Csomor
33a74b19c0 reflected latest file movements...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 07:42:56 +00:00
Stefan Csomor
4457f32a77 removed DoGetSize implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 07:39:01 +00:00
Stefan Csomor
7052b16ded removed carbon printing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 07:37:05 +00:00
Stefan Csomor
26b9b4e12a comments added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 07:35:06 +00:00
Stefan Csomor
8d4f85ce8d two fixes for CW/Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-24 07:30:50 +00:00
Julian Smart
b39dbf34b8 Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 19:16:45 +00:00
Julian Smart
d726047819 Applied patch [ 738821 ] Allow more features to be turned off
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 18:59:07 +00:00
Julian Smart
3443393889 Applied patch [ 736321 ] Compile error for src/msw/textctrl.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 18:56:14 +00:00
Julian Smart
404749841f Applied patch [ 742452 ] wxPrintDialogData: can't set PD_PAGENUMS
Applied patch [ 742446 ] wxPrintDialogData::GetAllPages always returns TRUE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 18:38:12 +00:00
Gilles Depeyrot
9946aa4bf0 removed print.cpp from list of Mac files and regenerated files.lst
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 18:18:42 +00:00
Mattia Barbon
bef8d4810d MinGW compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-22 20:51:36 +00:00
Mattia Barbon
092276a865 Correct wxCommandEvent.IsChecked() when generated from
a checkable menu item.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-22 20:39:28 +00:00
Mattia Barbon
94e785e128 Remove duplicate wxEmptyString declaration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-22 20:36:33 +00:00
Stefan Csomor
b9c102317d deactivating wxSTAY_ON_TOP patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-22 19:43:08 +00:00
Robin Dunn
5aed9d5067 Fix page positioning when the tabs are on a side different than
wxNB_TOP by choosing margins dynamically instead of always using fixed
margin sizes.  Also remove unnecessary large internal borders
(although they can be reactivated by flipping an #if.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 22:41:01 +00:00
Julian Smart
92647cb718 Added pngs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 22:02:54 +00:00
Julian Smart
0a4c16d6c4 Test using transparency in menu bitmaps.
Better, but still shows background when menu item selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 22:01:31 +00:00
Julian Smart
c0cb30dc8f Applied patch [ 731656 ] Owner draw menu icons
Benjamin I. Williams


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 19:07:02 +00:00
Julian Smart
f3466c5537 Applied patch [ 739401 ] gtk_init() has to be called before gdk_threads_enter()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 18:54:27 +00:00
Julian Smart
1fdf858b87 Applied patch [ 740012 ] GetKeyState returns 16-Bit value on WindowsNT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 18:43:03 +00:00
Julian Smart
0fc7f695ce Applied patch [ 740071 ] Make tiff errors/warnings use wxLog functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 18:25:24 +00:00
Mattia Barbon
732c0bfdff Stop the ApplicationShell from being managed (and thus show
on the screen as a "normal" window).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 16:50:46 +00:00
Julian Smart
deda94c5b4 Noted that the preview object is deleted by the frame.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 15:45:57 +00:00
Julian Smart
e6c96a7ca4 Applied patch [ 689188 ] adds wxToolBar::GetToolPos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 15:27:39 +00:00
Julian Smart
b5db27fe1e Fixed simple border style on wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 07:40:56 +00:00
Julian Smart
5024483dd0 A fix to prevent mungeing of the config file after reading in
entries (say, just one entry in one group), then adding entries
to a different group.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-20 21:45:04 +00:00
Stefan Csomor
1be0560eff DoGetSize implementation corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 18:49:11 +00:00
Stefan Csomor
746d758297 switch to pImpl pattern for mac printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 18:45:01 +00:00
Stefan Csomor
5f965f0b41 DoGetSize overrides
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 18:33:36 +00:00
Stefan Csomor
1da7f7a5be switch to pImpl pattern for mac printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 18:27:10 +00:00
Stefan Csomor
8a5b9f0807 switch to pImpl pattern for mac printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 18:22:03 +00:00
Václav Slavík
a71b82dda9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 16:46:27 +00:00
Václav Slavík
876262caf1 allow untranslated accelerators, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 16:45:47 +00:00
Julian Smart
a37e4a071c Corrected some wxAccessible mistakes
Implemented some SplitterWindowAccessible functions
in sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 14:00:18 +00:00
Julian Smart
067ad8205c Added list of possible slogans for wxWindows stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 07:40:25 +00:00
Julian Smart
c2d48b36a6 Added a backport item and items to the todo list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 07:36:47 +00:00
Roger Gammans
b4bfd0fa63 * Prevent miminum and actual row and col sizes going below the
minimum acceptable row size.
   This should fix sf.net bug #645734


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 20:15:17 +00:00
Roger Gammans
b8d24d4edd * Apply patch #735595. Add miminumAcceptable{Height,Width}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 19:49:43 +00:00
Stefan Csomor
b233688254 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 15:23:41 +00:00
Roger Gammans
ff699386b9 * Fix logical error in m_overflow attribute merging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 15:07:40 +00:00
Stefan Csomor
f243e00b4b no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 12:08:49 +00:00
Julian Smart
8ad9ca97bb Don't prepend directory to filename for shortcuts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 09:20:42 +00:00
Stefan Csomor
a1fea40ec6 not needed anywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 07:58:39 +00:00
Stefan Csomor
20cd7383dd UMAPr.. calls for classic only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-18 07:43:03 +00:00
Mattia Barbon
76208c7ef6 Remove dead code. Factor out duplicated code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 20:14:07 +00:00
Mattia Barbon
719e7f81cc Update changes.txt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 19:52:58 +00:00
Mattia Barbon
3f3071dcd5 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 19:51:02 +00:00
Julian Smart
7051e6c79c Corrected wxScrollBar style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 09:30:00 +00:00
Stefan Csomor
8868ab3313 finding papersizes allows for 1 mm tolerance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 07:45:47 +00:00
Stefan Csomor
b47d37a99f temporary fix for carbon (problems under OS 9)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-17 07:44:04 +00:00
Julian Smart
ba8c70bb2e Wizard now validates as well as doing data transfer when
pressing Back or Next


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-16 21:21:53 +00:00
Stefan Csomor
cfb00da4c4 carbon printing extended
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-16 20:39:24 +00:00
Stefan Csomor
e99cc06dc6 ValidateOrCreate added for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-16 20:36:37 +00:00
Stefan Csomor
056541fab7 added cw support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-16 16:15:58 +00:00
Václav Slavík
92337e39b9 unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-15 22:38:32 +00:00
Julian Smart
c09615b8ed An attempt to make the notebook sizer report its size
correctly under Windows, otherwise you get a huge gap
at the bottom if fitting to the content of the page.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-15 22:15:25 +00:00
Stefan Csomor
c91a2f7e67 forgot to commit project file for CW before
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-15 09:31:52 +00:00
Julian Smart
6390284bfa Doc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-14 21:31:03 +00:00
Robin Dunn
46a5010a06 Acutally use the m_maxChars parameter value instead of ignoring it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-14 20:50:55 +00:00
Robin Dunn
7c5e6fc68e Changes allowing for proper KEY_DOWN and CHAR events for wxGTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-14 19:25:18 +00:00
Jouk Jansen
44d511ad4d Committing in .
wxMOTIF for OpenVMS compilation updates

 Modified Files:
 	wxWindows/lib/vms.opt wxWindows/src/motif/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-14 06:52:46 +00:00
Mattia Barbon
9a595736d0 Derive wxStaticText from wxStaticTextBase, remove dead code/code
duplication. Likewise for wxStaticBitmap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 20:02:15 +00:00
Mattia Barbon
882b1d8d0e Fixed bug with notebook pages not showing (probably affected any
wxWindow/wxPanel child when panel was hidden and then shown again).
The bug was introduced by the fix for hidden windows still intercepting
mouse events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 19:52:58 +00:00
Mattia Barbon
f332a5a0f8 Lesstif compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 19:50:33 +00:00
Julian Smart
932b55d0d6 Reordered the slow-click test, otherwise it would never
be fired if in row-select more. Also added a ClearSelection,
which was omitted in the changes since 2.4.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 17:45:23 +00:00
Julian Smart
7699361c96 Rationalised style handling in tree control
No longer use WS_EX_WINDOWEDGE since it seems to be obsolete,
and has no effect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 15:20:50 +00:00
Julian Smart
6678c7f838 Removed obsolete check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-13 15:16:54 +00:00
Václav Slavík
f2034f1b6e applied HTML pagebreaks patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 22:33:51 +00:00
Mattia Barbon
6769d0cbf3 Factored out some common code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 20:04:08 +00:00
Mattia Barbon
11eadd92f3 Removed dead code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 19:58:45 +00:00
Mattia Barbon
47be989f6b Implemented copy-on-demand for wxClipboard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 19:55:35 +00:00
Mattia Barbon
3f85391ea7 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 19:54:01 +00:00
Mattia Barbon
0cc1d4ff2a Removed redundant wx<Control>NameStr declarations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 19:52:43 +00:00
Julian Smart
22a746d726 Apply correct style variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 10:09:40 +00:00
Julian Smart
975ee4b4a9 Auto 3D border if parent is panel or dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 10:04:46 +00:00
Vadim Zeitlin
be9b0663d9 reworked vertical scrolling code to correspond better to what I think is correct (horizontal case is unchanged)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 08:35:53 +00:00
Vadim Zeitlin
0cf5de1133 changed handling of range/max scrolling parameter and cleanup (removed Win16 code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 08:33:48 +00:00
Vadim Zeitlin
5eae641dd6 fixed bug in WinStruct<> ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 23:25:14 +00:00
Vadim Zeitlin
bffa02ff6f added WinStruct<>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 22:43:28 +00:00
Vadim Zeitlin
c4e54c6d80 moved missing constants definitions to their right place in wx/msw/missing.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 22:41:23 +00:00
Vadim Zeitlin
3136f782be wxTextBuffer ctor bug and something else
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 22:29:31 +00:00
Vadim Zeitlin
51e257806f init m_isOpened in ctor (bug 736208)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 22:28:16 +00:00
Chris Elliott
7db39dd699 digital mars fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 20:02:40 +00:00
Gilles Depeyrot
4431a7322b We don't put main() in the library any more.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 19:31:00 +00:00
Gilles Depeyrot
e8617760b0 assert is raised when using the thread sample (which works) so the test is
probably not so easy. Can widget callbacks be triggered from child threads
and, if so, for which widgets?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 19:28:13 +00:00
Gilles Depeyrot
edf6a06341 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as available updates
contain a bug concerning #pragma interface handling that can only be worked
around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 18:08:58 +00:00
Gilles Depeyrot
e8117e7f5c updated CodeWarrior 5.3 xml project with latest changes to file list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 18:08:51 +00:00
Gilles Depeyrot
3399051ee9 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as available updates
contain a bug concerning #pragma interface handling that can only be worked
around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 17:57:23 +00:00
Gilles Depeyrot
d5f3e1ebf5 added assert to detect attempt to install idle handler from widget callback
not called from main thread


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 16:44:48 +00:00
Vadim Zeitlin
275a63e3a6 use alpha channel in Blit() as well and not only in DrawBitmap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 11:14:35 +00:00
Vadim Zeitlin
c9fcf5817f many fixes for PNG reading after recent alpha changes; grey scale images reading was in particular broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 10:49:27 +00:00
Vadim Zeitlin
edb57eaebe added missing typename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 01:04:10 +00:00
Vadim Zeitlin
70cd62e95c TRUE/FALSE -> true/false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 01:01:36 +00:00
Vadim Zeitlin
aaa9782834 wxImage::Create() should be bool, not void
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-11 00:59:42 +00:00
Vadim Zeitlin
d9ef4e06ed added LVSICF_NOSCROLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 12:55:39 +00:00
Vadim Zeitlin
8fa97a5819 compilation fix for BCC (and probably others)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 12:53:08 +00:00
Vadim Zeitlin
73baf01ab3 compilation fix (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 11:43:39 +00:00
Vadim Zeitlin
82eba82658 fix wxDisplay initialization (patch 735303)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 00:57:51 +00:00
Vadim Zeitlin
41b78190ad recognize ESC[APE] in menu accel strings (patch 733967)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 00:56:07 +00:00
Vadim Zeitlin
a8fbc9cc57 fall back to wxAlphaBlend() if ::AlphaBlend() didn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:57:34 +00:00
Vadim Zeitlin
4b8ab2f93a use DIB, not DDB, when converting from an image with alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:54:16 +00:00
Vadim Zeitlin
edf8e8e071 memory for alpha channel was over allocated by a factor of 3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:52:20 +00:00
Vadim Zeitlin
2f22353e37 fixed iterator over wxImage with alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:50:43 +00:00
Julian Smart
2c92d7e398 Removed a spurious print statement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 23:32:55 +00:00
Julian Smart
ff38281aa1 Fixed crash in EnsureVisible in wxTR_HIDE_ROOT mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 21:48:24 +00:00
Vadim Zeitlin
243dbf1a50 Insert() patch from John Labenski
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 12:58:28 +00:00
Vadim Zeitlin
b5f159ac91 use wxDEPRECATED around GetNoHistoryFiles()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 12:04:01 +00:00
Jouk Jansen
d171743ed3 Committing in .
Fixes needed for OpenVMS

 Modified Files:
 	wxWindows/include/wx/x11/private.h
 	wxWindows/include/wx/x11/privx.h
 	wxWindows/src/common/dbtable.cpp
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/motif/bmpmotif.cpp
 	wxWindows/src/motif/descrip.mms wxWindows/src/x11/bitmap.cpp
 	wxWindows/src/x11/utilsx.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 10:53:52 +00:00
Stefan Csomor
1925be658c fixing some redrawing bugs overpainting foreign window's area under OS9, reintroduced TransitionWindow calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 07:16:30 +00:00
Stefan Csomor
76a60a81b4 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 07:13:32 +00:00
Stefan Csomor
4506b24a05 masking out wxOK and friends from dialog style in order to avoid clashes with miniframe windows flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 07:12:53 +00:00
Stefan Csomor
140f2012cd reintroduced m_isBeingDeleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 07:12:02 +00:00
Vadim Zeitlin
7af6b69e74 wxDocManager::GetNoHistoryFiles() renamed to GetHistoryFilesCount()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-09 00:02:58 +00:00
Vadim Zeitlin
1162d0a257 wxGLCanvas doesn't derive from wxScrolledWindow since quite some time already despite of the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-08 23:46:34 +00:00
Vadim Zeitlin
50ef440170 undid patch which was supposed to allow thread recreation and added instead an assert preventing it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-08 23:38:05 +00:00
Robin Dunn
faad0a95e1 Prevent scrolling back to the top when calling SetItemCount again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-08 06:29:39 +00:00
Robin Dunn
7e6874c014 Fix GetItemRect to offset by the header window, if present.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-08 02:17:52 +00:00
Robin Dunn
45ff80056c Added #if TARGET_CARBON around shaped window stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 20:31:29 +00:00
Julian Smart
0bbeb42dde Ensure grid components don't have borders
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 20:16:41 +00:00
Václav Slavík
139c5871c9 fix for multiple initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 19:03:10 +00:00
Robin Dunn
b63fce942f fixed compile errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 18:08:01 +00:00
Robin Dunn
ef5df12bdf Also merge the m_overflow attribute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 17:50:08 +00:00
Mattia Barbon
dd38c87578 Implemented wxBitmapDataObject.
Implemented generic wxDataObject support in wxClipboard.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 17:24:11 +00:00
Julian Smart
27c7397611 More style issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 16:07:36 +00:00
Julian Smart
31e7e89fdd Fixed style glitches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 15:03:11 +00:00
Julian Smart
6ae0daf6c5 Added WS_VISIBLE style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 14:02:38 +00:00
Chris Elliott
05d3cd45e5 update for digital mars - resolve externals in shell and winsock libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 13:18:45 +00:00
Chris Elliott
44e8cf38f1 missing externals for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 13:09:14 +00:00
Chris Elliott
e81cf2eb73 update makefile.sc for digital mars to use relative paths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 11:41:21 +00:00
Chris Elliott
f5705f7e3e update makefile.sc for digital mars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 11:20:32 +00:00
Chris Elliott
f0fc695806 remove if defs for DigitalMars as suggested by Vadim
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 09:14:14 +00:00
Julian Smart
acd42a2395 Removed some commented-out code
Added border improvements to changes.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 08:32:57 +00:00
Robin Dunn
8adb5d4557 Added inline setters for wxTreeEvent so we don't need to add new
friends anytime someone wants to generate wxTreeEvents


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-07 00:30:37 +00:00
Robin Dunn
0b887a21d4 allow the base class to participate in the CanPaste decision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 23:43:39 +00:00
Julian Smart
fe3d9123c6 Revamped border handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 21:57:32 +00:00
Chris Elliott
957f03699b possible fix for templates with digitalmars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 15:08:52 +00:00
Julian Smart
59fac08507 Removed obsolete 16-bit import libs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 09:44:36 +00:00
Robert Roebling
6d18407fa4 Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 08:52:14 +00:00
Chris Elliott
ce51dc7507 update digitalmars makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 08:13:18 +00:00
Chris Elliott
025bbf5bcf update install docs for MSW (Borland & Digital Mars)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 08:08:07 +00:00
Julian Smart
8161ba085f Doc clarifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 07:53:46 +00:00
Robert Roebling
bcc4c54184 Penguin Unicode compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 07:22:13 +00:00
Robert Roebling
2b5b932572 OpenGL for GTK2 fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 07:21:22 +00:00
Robert Roebling
84e7741af6 Splitter clean up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 07:20:14 +00:00
Mattia Barbon
1ae2e0af5a Fix for crash on exit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-05 20:51:18 +00:00
Robert Roebling
7f5f144a81 Upported fix to mouse capture event handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-05 08:42:22 +00:00
Julian Smart
d60913555c Initialised m_isBeingDeleted -- I don't know how anything
worked without it...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 21:09:58 +00:00
Julian Smart
1dfc3cda6e Setting state to STATE_NEW in wxThread::Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 20:51:09 +00:00
Mattia Barbon
eb6fa4b425 Changed the way ApplicationShells are used: now wxMotif
creates one ApplicationShell per display, and makes top
level windows popup childs of the ApplicationShell.
  Removed a couple of unused variables from wxApp.
  Replaced some calls to wxGetDisplay with XtDisplay(widget)
or event.xany.display, and some others with wxGlobalDisplay
(the latter changes are just eyecandy).
  Used wxFlushEvents where appropriate.
  Fixed (hopefully) wxFindAcceleratorText and wxFindAccelerator;
for now the new version is still disabled, awaiting further testing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 17:40:46 +00:00
Mattia Barbon
b0feedc5db Avoid crash during global destruction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 17:35:44 +00:00
Julian Smart
cfbf444a53 Applied updated patch [ 731719 ] Owner draw font leak/overuse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 17:12:58 +00:00
Julian Smart
1d105d58f4 Added defined() to directive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 15:50:27 +00:00
Julian Smart
84969af72d Added some missing copyright lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 14:11:45 +00:00
Mattia Barbon
28169f14ec Fix for the fact that unmapped but managed widgets
intercept mouse events even if they are not visible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 12:19:57 +00:00
Mattia Barbon
44f5b99574 Pass events to pushed event handlers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 12:17:15 +00:00
Robin Dunn
819451b6c7 Reversed the meaning of black and white in wxRegion::ConvertToBitmap
so it matches the menaning of black and white in wxMask


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 17:56:30 +00:00
Julian Smart
40f359cafe Applied [ 731578 ] wxThread state bugfix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:41:57 +00:00
Stefan Csomor
2cee82b781 corrected pageRect for non carbon targets, removed commented obsolete sections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:41:03 +00:00
Julian Smart
afd366a714 Added items to todo list and publicity doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:34:28 +00:00
Julian Smart
dddcedbf7f Mentioned: Applied patch [ 701238 ] Added BLOB support to dbtable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:32:23 +00:00
Julian Smart
5962bdb85a Applied patch [ 701238 ] Added BLOB support to dbtable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:28:18 +00:00
Julian Smart
4b8f491298 Applied patch [ 726350 ] wxGrid - MovePageDown()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:17:38 +00:00
Julian Smart
cb27bab1e6 Applied patch [ 731846 ] GTK Print Options
Print options were omitted from print command


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:11:55 +00:00
Julian Smart
69e66915e3 Mentioned wxImage::Scale improvement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:07:55 +00:00
Julian Smart
ff865c132a Applied patch [ 730686 ] wxImage::Scale speed improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 15:06:07 +00:00
Julian Smart
8c18da2e41 Applied patch [ 731195 ] More #if/#endif's to build a smaller library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 13:50:04 +00:00
Julian Smart
384c96533e Doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 13:45:00 +00:00
Julian Smart
c754f4aa00 Mentioned docview changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 13:39:04 +00:00
Julian Smart
19b4237945 Applied patch [ 731719 ] Owner draw font leak/overuse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 11:56:38 +00:00
Julian Smart
9d4a05be9b Applied some of patch [ 622660 ] consistent behaviour for docview.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 11:44:40 +00:00
Julian Smart
a36d790a7b Added m_isOpened variable to simulate opening/closing
the clipboard on wxMSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 17:48:17 +00:00
Chris Elliott
dec2b82453 digital mars updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 14:48:05 +00:00
Chris Elliott
76c718091a typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 14:05:03 +00:00
Chris Elliott
1e3c12d774 implement wxHAVE_RAW_BITMAP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 12:58:00 +00:00
Julian Smart
7a311019db Corrected a memory leak I introduced in the last patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 12:49:07 +00:00
Chris Elliott
e6c13db6ec fix bug to make Borland compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 12:47:07 +00:00
Chris Elliott
7581faf616 digital mars updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 12:16:28 +00:00
Chris Elliott
bf978f96c2 Macro swicth from SC to SYMANTEC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:30:18 +00:00
Chris Elliott
384f18ed35 info about digitalmars in header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:28:38 +00:00
Chris Elliott
2bdf715463 Macro swicth from SC to SYMANTEC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:21:03 +00:00
Chris Elliott
0b3f29b359 fix for digitalmars header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:19:20 +00:00
Chris Elliott
e7e793efd3 fix for digitalmars header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:13:07 +00:00
Vadim Zeitlin
33caa9948d make accelerators for bitmap menu items work (patch 626048)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 23:15:09 +00:00
Vadim Zeitlin
20f18ea193 compilation fix when WXUNUSED(arg) == arg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 22:53:59 +00:00
Vadim Zeitlin
eb76cc945b added (back?) CROSS support (patch 658234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 22:36:46 +00:00
Vadim Zeitlin
4d0d77affc show the taskbar icon even after Explorer restart (patch 723532) + some code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 20:49:34 +00:00
Vadim Zeitlin
660b190686 fixed spurious debug error message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 20:41:59 +00:00
Vadim Zeitlin
d694de12e7 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 20:03:32 +00:00
Vadim Zeitlin
2eefae6efa better handling of transparent colour in wxImage conversion (patch 726208)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 19:59:40 +00:00
Vadim Zeitlin
8e0a317c4f stddef.h required for IRIX compilation (patch 721388)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 19:47:16 +00:00
Vadim Zeitlin
e8c6a69c9d set the index for BEGIN_DRAG events (patch 726308)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 19:38:42 +00:00
Vadim Zeitlin
e9c8005b47 only set replace string for replace events (patch 728415)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 19:35:47 +00:00
Vadim Zeitlin
8ab40c5227 fixes for working with mono bitmaps (patch 728768)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 19:31:30 +00:00
Vadim Zeitlin
10545ca4e7 fix for a crash in ~wxLocale and incorrect GetLanguage() return value (patch 729758)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 17:06:41 +00:00
Vadim Zeitlin
adf9e09990 missing #if's needed for compilation with some wxUSE_XXX set to 0 (patch 728413)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 16:52:17 +00:00
Vadim Zeitlin
ea39221211 fix a problem with Unicows (patch 720542)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 16:46:28 +00:00
Vadim Zeitlin
2015f2b308 fix the wrong size of the first page when it's added to the notebook (replaces patch 728770)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 16:39:59 +00:00
Vadim Zeitlin
a452af5e68 allow raw access to a part of the image only (faster when using alpha)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 16:37:51 +00:00
Julian Smart
b72b192036 Implemented delayed closing of an existing document
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 15:40:39 +00:00
Julian Smart
1cf1238db4 Reset m_lastItem to avoid crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 15:38:55 +00:00
Julian Smart
3e3a7b97ec Implemented delayed selection (e.g. after adding the root
or deleting items) so that the event handler will be
called appropriately.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 15:37:30 +00:00
Julian Smart
5c180caf1b Removed backslashes in verbatim example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 13:37:59 +00:00
Vadim Zeitlin
444d3e017e read numbers even if they're followed by spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 11:08:22 +00:00
Vadim Zeitlin
2423ef22ee compilation fix for Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 00:48:58 +00:00
Václav Slavík
cf5e94bc6d fixed Norwegian Bokmal code to conform to new ISO 639-2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 22:48:01 +00:00
Stefan Csomor
c0ef107e6b correcting non-unicode char conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 20:19:29 +00:00
Stefan Csomor
4241baae44 removing unused flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 20:17:13 +00:00
Stefan Csomor
dd49c69170 include "ToolUtils.h" for LoWord and friends
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 19:01:55 +00:00
Vadim Zeitlin
ef33c57631 fixed configure for autoconf 2.5x (patch from Olly Betts)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 13:31:09 +00:00
Julian Smart
00013f54a2 Allow for +/- in E part
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 12:44:03 +00:00
Julian Smart
7102c47355 Allow 'e' or 'E' in numeric text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 09:43:03 +00:00
Julian Smart
e0f4c2c88b Use the context help XPM for MSW too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 08:41:31 +00:00
Robin Dunn
6a7e641161 Shaped window support for wxMac, plus a wxSTAY_ON_TOP fix from Egon
<e_lub@yahoo.com>   wxMac requires knowledge before Create that SetShape
will be called so I also added the wxFRAME_SHAPED style flag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-30 00:39:15 +00:00
Vadim Zeitlin
e97251c58e compilation fix for !USE_PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-29 22:39:02 +00:00
Mattia Barbon
f734e1dad1 MinGW compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-29 21:15:28 +00:00
Julian Smart
91fd135b38 Fixed brace problem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-29 10:26:52 +00:00
Chris Elliott
5d19b6acd1 fix filefn conditional error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-29 09:36:05 +00:00
Chris Elliott
f15dcc0158 update to make digitalmars compile/link libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 21:12:02 +00:00
Chris Elliott
3e6477f4ab SF patch [ 708702 ] Wide character filename support for BCC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 21:09:58 +00:00
Chris Elliott
a3bb1d14a5 SF patch [ 708702 ] Wide character filename support for BCC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 20:58:29 +00:00
Mattia Barbon
6cee329241 Blind compilation fix in the case where libXpm
isn't available.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 19:55:18 +00:00
Robin Dunn
cd01e3646a SF Patch #728691, dangling pointer fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 18:44:27 +00:00
Chris Elliott
9a55c2ee2a fix wxChar error in docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 15:09:59 +00:00
Vadim Zeitlin
b8985048a5 fix for Unicode compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 11:51:53 +00:00
Julian Smart
2f930c8501 Doc suggestions applied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 10:37:08 +00:00
Julian Smart
01d0d0e57d Fixed [ 728819 ] memory leak in ipcbase.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 10:33:05 +00:00
Vadim Zeitlin
6298b8d0b2 another blind fix for wxX11 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 02:08:57 +00:00
Vadim Zeitlin
1d2f48b681 updated to use the new raw bitmap API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 02:04:09 +00:00
Vadim Zeitlin
b9bcaf117a new template-based more flexible and hopefully more efficient raw bitmap implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-28 01:46:05 +00:00
Vadim Zeitlin
96df9ed9b1 create tab ctrl with WS_VISIBLE style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-27 21:49:22 +00:00
Vadim Zeitlin
bb793b0cfb *really* fixed searching in sorted arrays
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-27 15:17:46 +00:00
Vadim Zeitlin
13a6fb3a25 don't hardcode wxCHOICEDLG_DIALOG_STYLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-27 13:30:01 +00:00
Stefan Csomor
a722995e62 moving rollover check, was causing hangs upon termination in case ->top was 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-26 20:18:20 +00:00
Stefan Csomor
7f7a740336 transition window calls had some problems with layering, switched back to hide and show native calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-26 20:01:43 +00:00
Mattia Barbon
e6be3e7c1b Implemented wxEntryStart, wxEntryInitGui, wxEntryCleanup.
Removed code already in wxTopLevelWindowBase.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-26 12:54:45 +00:00
Václav Slavík
4f1f340199 added xh_wizrd.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 22:34:25 +00:00
Mattia Barbon
77e0239d76 Patch [ 726877 ]: Remove /GX- from makevc.env
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 20:42:25 +00:00
Mattia Barbon
94923d5127 Compilation fix for wxBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 20:26:32 +00:00
Mattia Barbon
9a8ffaddeb Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 20:24:35 +00:00
Chris Elliott
d56327cd06 update to make digitalmars compile/link libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 18:55:46 +00:00
Mattia Barbon
8a73873fa0 Not used anymore.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 12:13:31 +00:00
Vadim Zeitlin
c8011d7377 fixed bug recently introduced in wxSortedArray::Index()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 12:06:25 +00:00
Vadim Zeitlin
0cad49b42c blind fix for wxMotif compilation with wxHAVE_LIB_XPM == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 11:10:45 +00:00
Jouk Jansen
c5a2f27478 Committing in .
#undef before #def in order to suppress redefinition warnings

 Modified Files:
 	wxWindows/contrib/include/wx/deprecated/setup.h
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-25 06:06:08 +00:00
Mattia Barbon
56cc1400c7 COmpilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 22:17:14 +00:00
Mattia Barbon
a28fda44bc Added wxWizard handler to Makefile.in.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 22:15:21 +00:00
Chris Elliott
d26fad77f7 update to make digitalmars compile/link html\test sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:56:03 +00:00
Chris Elliott
7960c7b4c5 update to make digitalmars compile/link make clean
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:37:23 +00:00
Chris Elliott
2cea8d2558 update to make digitalmars compile/link make clean
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:16:56 +00:00
Chris Elliott
ee252037cf update to make digitalmars compile/link make clean
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:08:21 +00:00
Chris Elliott
e9196d9c63 update to make digitalmars compile/link html sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:07:02 +00:00
Chris Elliott
5bfebd013e update to make digitalmars compile/link image sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 21:02:07 +00:00
Robert Roebling
50382578c1 Another attempt to fix the freeze while mouse capturing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 17:41:10 +00:00
Robert Roebling
6e7d0063bc Upported minor fix for font dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 14:35:29 +00:00
Jouk Jansen
b41f79f59d Committing in .
reinstalled one wxvariant instance which is used in dbgrid.cpp

 Modified Files:
 	wxWindows/src/common/variant.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 13:51:53 +00:00
Jouk Jansen
96f4ca4201 Committing in .
wizard.cpp contains "deprecated" code

 Modified Files:
 	wxWindows/src/generic/wizard.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 13:50:25 +00:00
Jouk Jansen
6804a3f719 Committing in .
Updated OpenVMS compile support

 Modified Files:
 	wxWindows/descrip.mms wxWindows/setup.h_vms
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/descrip.mms
 	wxWindows/utils/dialoged/src/descrip.mms
 Added Files:
 	wxWindows/contrib/src/deprecated/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 13:48:51 +00:00
Chris Elliott
56689e1b3a explicit cast for digital mars to use OLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-24 11:15:36 +00:00
Robin Dunn
368a4a4784 Prevent a Gtk-CRITICAL message when Remove()ing a menu from a menubar
that has submenus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 21:08:42 +00:00
Robin Dunn
1bc54e3257 Fix setting the scrollbar positions (SF Bug #721159)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 21:04:26 +00:00
Chris Elliott
465b213606 digital mars compiler updated - test no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 15:29:57 +00:00
Robert Roebling
33688b28c3 Typo in mouse event code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 06:37:05 +00:00
Chris Elliott
4ded51f2fa update to make digitalmars compile/link image sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-22 21:12:30 +00:00
Chris Elliott
0caac3b4a9 update to make digitalmars compile/link image sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-22 21:02:29 +00:00
Václav Slavík
9e82cf9876 modification to wxSizer handler needed for wxWizard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-22 20:26:06 +00:00
Václav Slavík
a84c0558d8 tooltips should be translated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-22 20:25:58 +00:00
Václav Slavík
e5db28fd7c added wxWizard handler to XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-22 20:25:50 +00:00
Václav Slavík
b867ed682d fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-21 11:23:02 +00:00
Robin Dunn
9e730a7876 Updated Scintilla to 1.52 (on the trunk this time too)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 20:00:02 +00:00
Chris Elliott
ce8897bbff update to docs now minimal sample compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 19:49:58 +00:00
Chris Elliott
059b646254 update to make digitalmars link minimal sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 19:42:44 +00:00
Chris Elliott
48bac87b56 update to make digitalmars compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 19:28:19 +00:00
Chris Elliott
cc972ac67e update to make digitalmars link - I really don't like the extern C declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 19:25:28 +00:00
Chris Elliott
4ce1efe123 update to make digitalmars compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 18:15:17 +00:00
David Elliott
e668651137 Separated the Objective-C to C++ association code into the new header
ObjcAssociate.h.  That leaves ObjcPose.h for its original purpose and
avoids including it from any header files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 17:51:50 +00:00
David Elliott
fb45bb1fb2 #include "wx/cocoa/ObjcPose.h" from the source in preparation for removing
it from the already included headers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 17:40:46 +00:00
Gilles Depeyrot
5822d04ada corrected for resource compilation with Apple Developer Tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:17:23 +00:00
Gilles Depeyrot
475b09e7a7 updated Project Builder minimal sample project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:16:33 +00:00
Gilles Depeyrot
9bd1404d20 removed superfluous casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:15:44 +00:00
Gilles Depeyrot
90771fe589 added extern "C" for include of mach/mach.h to fix link errors with PB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:14:46 +00:00
Gilles Depeyrot
06ea1f023e removed unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:13:29 +00:00
Gilles Depeyrot
692db919db corrected warning (missing const)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:12:15 +00:00
Gilles Depeyrot
90b2e44c5b updated CodeWarrior 5.3 project with latest changes (files added and removed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 08:06:10 +00:00
Gilles Depeyrot
0b93f59c51 updated Project Builder project with latest changes (files added and removed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-19 07:58:07 +00:00
Vadim Zeitlin
abd9b10e39 make choice dialog resizeable by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 22:23:49 +00:00
Mattia Barbon
632cfe57c5 Reverted my last change, since it's ugly and does not
work anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 20:26:52 +00:00
Mattia Barbon
8fb29449e7 Fixed dist target; added relevant wxX11 files to wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 20:23:38 +00:00
Julian Smart
de996ce082 Can switch between clipping code mroe easily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 20:22:59 +00:00
Julian Smart
ca5020c229 Darkened preview background for Mac (else get stripey background)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 20:18:01 +00:00
Julian Smart
46b24ef914 Have dark colour for preview canvas under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 20:04:33 +00:00
Julian Smart
feea0f9569 Don't call MakeModal on the Mac -- it leaves
frames with non-working menubars if there
are multiple top-level frames


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 19:48:02 +00:00
David Webster
4b460879a2 Final update to catch the dropping of prop out of generic.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 18:53:01 +00:00
David Webster
0474c6efc6 Get rid of this file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 16:58:21 +00:00
Julian Smart
c4e98b3311 Disabling code that causes display glitch on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 16:17:42 +00:00
Julian Smart
29676ca095 Part of a patch I forgot to commit previously: demonstrating selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 16:15:30 +00:00
Julian Smart
e8737b66aa Added some items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 16:11:52 +00:00
Julian Smart
f77e1e5d0d Use wxLogTrace instead of wxLogDebug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 16:10:29 +00:00
David Webster
6e348b12dc More OS/2 updates reflecting changes in 24 Branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 15:47:35 +00:00
Julian Smart
9dff851556 Use sizers, not constraints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 15:37:44 +00:00
Chris Elliott
95bf19daf8 fix build for watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 12:19:45 +00:00
Chris Elliott
fc17ff87a1 rebuild filelist for borland compiler (datacmn changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 11:37:36 +00:00
Julian Smart
94dc12383d Removed old files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-17 09:48:24 +00:00
Václav Slavík
e23279e1a7 fixed memory leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-16 22:33:54 +00:00
Chris Elliott
8174870699 fix for removal of dosyacc.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-16 13:15:09 +00:00
Chris Elliott
3faedeb065 fix for removal of dosyacc.c
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-16 12:01:14 +00:00
Julian Smart
2dab56e91e Added wxAccessible documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-16 09:40:09 +00:00
Julian Smart
12fddefcbb Removed y_tab.c dependency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-16 07:57:56 +00:00
David Webster
4f5c180eba OS/2 updates to catch the port up with the rest of the library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-15 21:08:31 +00:00
David Webster
b823f462a1 OS/2 updates for lowercase bool values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-15 21:04:36 +00:00
Stefan Csomor
756c27045d added direct HICommand updating
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-15 19:39:44 +00:00
Vadim Zeitlin
8e7cd32b33 use symbolic constants instead of raw numbers for mouse buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-15 19:00:14 +00:00
Stefan Csomor
249aad307f Skipping Right_down event if generated context menu event is not handled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-15 17:07:27 +00:00
Vadim Zeitlin
753f2cb491 extracted duplicated code from src/*/data.cpp in a common file (forgot to commit before; sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 23:29:09 +00:00
Vadim Zeitlin
eaa6852f39 another update, only 7 untranslated strings left
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 20:17:51 +00:00
David Elliott
68698f0308 When saving the editable state, use the real state (m_editable)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 18:34:06 +00:00
Mattia Barbon
a8680e3e0e Code clanup: removed some useless/unused member
variables/functions from wxWindow; used
wxTranslateMouseEvent instead of duplicating its
functionality.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 17:27:28 +00:00
David Elliott
69dbb7098b Added InitMouseEvent helper method (like wxMSW)
Implemented the following mouse handlers:
mouseDown, mouseDragged, mouseUp, mouseMoved
Added stubs for the following mouse handlers:
mouseEntered, mouseExited, rightMouseDown, rightMouseDragged, rightMouseUp,
otherMouseDown, otherMouseDragged, otherMouseUp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 03:54:32 +00:00
David Elliott
fe802fc2ed Catch and forward the following mouse related events:
mouseMoved, mouseEntered, mouseExited
mouseDown, mouseDragged, mouseUp
rightMouseDown, rightMouseDragged, rightMouseUp
otherMouseDown, otherMouseDragged, oterMouseUp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 03:51:59 +00:00
David Elliott
b67d3706d9 Added NSEvent class for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 03:48:54 +00:00
David Elliott
e5a87141b4 Use (generic) text dialog for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 01:53:55 +00:00
Michael Bedward
d477aa2bb3 Added -w-inl to CFG section to suppress the annoying messages about event and radiobox functions not being inlined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 01:21:26 +00:00
Vadim Zeitlin
fa275e8648 support raw access to DDBs as well as DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 01:03:41 +00:00
Vadim Zeitlin
8ffc8f1fb9 added debug checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 01:03:04 +00:00
Vadim Zeitlin
3692b94818 fixes for Win95 (where GetObject(DIBSECTION) is broken)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 00:59:48 +00:00
Vadim Zeitlin
30ad0a1469 don't crash if an image is not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-14 00:46:59 +00:00
Julian Smart
4455332266 Test for result of searching for wxID_CANCEL button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 22:56:09 +00:00
Julian Smart
8d60dc8aa0 Don't use focus if NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 22:38:57 +00:00
Vadim Zeitlin
e340193bb6 removed accidentally left #ifdef WATCOM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 22:11:42 +00:00
Vadim Zeitlin
06d0938900 renamed GlobalHandle class to GlobalPtr to avoid conflict with the Win32 function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 21:58:59 +00:00
Julian Smart
70ddb200c1 Set wxPendingEvents to NULL after deleting it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 21:08:39 +00:00
Vadim Zeitlin
7af64aace1 don't crash in UngetRawData() if it is invalid; fixed rounding errors in alpha premultiplying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 16:23:40 +00:00
Vadim Zeitlin
878711c01c implemented fallback for AlphaBlend() for the systems not supporting it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:59:49 +00:00
Vadim Zeitlin
cc37ebe090 don't return garbage from GetRawBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:58:47 +00:00
Vadim Zeitlin
98ea6b7d6a added missing wxBitmap(w, h, dc) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:52:14 +00:00
Vadim Zeitlin
69440cd26c added the list of supported accelerators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 15:36:35 +00:00
Vadim Zeitlin
12338247ae better alpha test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:11:01 +00:00
Vadim Zeitlin
106c33bb1d fix alpha premultiplying
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:09:00 +00:00
Mattia Barbon
a968cb805f Removed conflict markers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:07:51 +00:00
Vadim Zeitlin
13c13ecbbf premultiply the colours by the alpha value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:02:17 +00:00
Mattia Barbon
e34dcad290 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 14:01:28 +00:00
Mattia Barbon
510bf1ec20 Fix wxMotif build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 13:58:01 +00:00
Vadim Zeitlin
e1b998ce2d no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 13:55:53 +00:00
Vadim Zeitlin
10b41b53cb added wxBitmap::UseAlpha()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 13:45:20 +00:00
Vadim Zeitlin
bc9f356d52 added test image for alpha
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 13:44:35 +00:00
Stefan Csomor
bfe9ffbc8f supported controls on toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 11:57:48 +00:00
Stefan Csomor
c2fa4af423 implemented constructor for rect from point and size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 11:55:25 +00:00
David Elliott
e67cc398eb Include datacmn.cpp in wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 06:29:13 +00:00
David Elliott
b79297d243 Removed everything since it's now in datacmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 06:10:03 +00:00
David Elliott
d5ca66298a Implemented Raise()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 05:40:01 +00:00
Vadim Zeitlin
84a667dc06 fixed unused variable warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 02:22:52 +00:00
Vadim Zeitlin
376b18eac7 fixes necessary for the default GUI log target to be used in Debug mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 02:22:00 +00:00
Vadim Zeitlin
8c9564b392 fixed yet another printf() format warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 02:11:12 +00:00
Vadim Zeitlin
fba1b53b87 fixed printf() format warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 02:08:03 +00:00
Vadim Zeitlin
a25d51afbc fixed a printf() format warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 01:48:17 +00:00
Vadim Zeitlin
f7155274cc fixed a harmless warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-13 01:26:43 +00:00
Václav Slavík
30a8c81ddb backport wxZipFsHandler fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 22:30:48 +00:00
Václav Slavík
a42c2eece0 removed outdated docs (fixes bug #698139)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 22:29:04 +00:00
Václav Slavík
ddaf55663f fixed relative filenames inside ZIP archive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 22:28:51 +00:00
Václav Slavík
d0b50ad939 better error message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 22:28:13 +00:00
Václav Slavík
5571f3d3d7 applied patch to fix tooltips charset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:40:48 +00:00
Václav Slavík
e624f5ba66 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:38:30 +00:00
Václav Slavík
1a31de36a4 added LDFLAGS_GL to makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:38:10 +00:00
Václav Slavík
707a378282 compilation fix for gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:37:20 +00:00
Václav Slavík
96c0a5167b added Georgian translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:37:05 +00:00
Stefan Csomor
732b3a752b redraw fixes for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:05:17 +00:00
Stefan Csomor
2027c6db5b adaption to deprecated files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 18:03:12 +00:00
Vadim Zeitlin
100cf085fb fixed Moving() documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 13:16:20 +00:00
Vadim Zeitlin
a364b95710 added Ukrainian translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 13:15:27 +00:00
David Elliott
7875262d29 DECLARE_WXCOCOA_OBJC_CLASS now declares types as struct objc_object* so that
they are exactly the same type for C++ and Objective-C++ code.  This allows
them to be used as arguments to functions, especially virtuals, because
the C++ name mangling will be the same.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 04:17:37 +00:00
Vadim Zeitlin
89e3b3e448 fixed syntax error in configure.in; regenerated configure after recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 01:18:57 +00:00
Vadim Zeitlin
ff101af5b8 Unix OpenGL build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 01:13:07 +00:00
Vadim Zeitlin
021fde89a6 don't suppose that libs GL and GLU arei n the same directory (bug 699289)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 01:11:49 +00:00
Vadim Zeitlin
260d684906 trying to fix threads compilation options: use -Ethreads under UnixWare, don't use -pthreads under IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 01:02:02 +00:00
Vadim Zeitlin
1d2e5548c4 UnixWare compilation fix (explicitly declare pthread_mutexattr_settype)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:53:37 +00:00
Vadim Zeitlin
ef6a2689b4 user dash and container focus patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:47:45 +00:00
Vadim Zeitlin
918dc51991 fixes return values of wxSemaphore::TryWait() and WaitTimeout() to behave as documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:43:28 +00:00
Vadim Zeitlin
a5e3c24d7b UnixWare compilation fix (include sys/filio.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:35:14 +00:00
Vadim Zeitlin
4a8900f257 added UnixWare recognition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:32:22 +00:00
Vadim Zeitlin
66f2199449 Unixware compilation fix (#undef index)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:22:45 +00:00
Vadim Zeitlin
d26d975463 fixed CheckTransparency() for RGBA images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:03:16 +00:00
Vadim Zeitlin
7ce4426ae3 2.4 -> 2.5; build in another directory than source one; mention --disable-shared
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-12 00:02:28 +00:00
Vadim Zeitlin
dca9009bcc unstable doesn't mean it crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 23:56:27 +00:00
Václav Slavík
851ccc357b don't forget to backport manifest and wxLocale fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 23:24:05 +00:00
Václav Slavík
5db932052d added WindowsXP manifest directly into application's resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 23:22:39 +00:00
Václav Slavík
65dc921d3f don't report setlocale failure if trying to set Unicode-only language
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 23:20:36 +00:00
Robin Dunn
ef4a634b1b Fixed wxMac's wxTextCtrl::SetSelection so that (-1,-1) will select the
entire value like other ports do.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 22:38:56 +00:00
Vadim Zeitlin
4365da58c8 fixed bug with searching in sorted arrays
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 22:05:24 +00:00
Chris Elliott
dc7219d2e1 correct Watcom build instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 14:31:24 +00:00
Vadim Zeitlin
6eb37239e0 use on gdk_draw_lines() call instead of multiple gdk_draw_line() ones (patch 717012)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 14:14:23 +00:00
Vadim Zeitlin
e2a5251d01 fixes for user dash handling (patch 717736)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 14:02:32 +00:00
Vadim Zeitlin
3251b83466 containers don't always accept focus (patch 718913)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 13:48:27 +00:00
Julian Smart
bd4a25bc50 Moved wxDateTime::TIME_T_FACTOR into datetime.cpp to
prevent VC++ confusion


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-11 11:01:39 +00:00
Václav Slavík
66010e8d0d don't use deprecated macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 23:01:42 +00:00
Vadim Zeitlin
bfe835d075 regenerated with tmake after adding datacmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 21:08:29 +00:00
Vadim Zeitlin
6a76384f2d extracted duplicated code from src/*/data.cpp in a common file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 20:33:17 +00:00
Vadim Zeitlin
11968fef9c don't use deprecated IntToString function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 18:14:38 +00:00
Vadim Zeitlin
e12c92c2f7 moved wxFloat/DoubleToStringStr from src/*/data.cpp to src/common/utils.cpp; took all String <-> Numebr functions inside WXWIN_COMPATIBILITY_2_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 13:08:46 +00:00
Vadim Zeitlin
b1a28eef7c set krc to wxKILL_OK on success
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-10 00:14:17 +00:00
Gilles Depeyrot
19bb2f5bbe if we are not in the main thread, output the assert directly and trap since
dialogs cannot be displayed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 20:30:33 +00:00
Mattia Barbon
1eb1eae717 Compilation fix (missing headers).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 17:07:25 +00:00
Mattia Barbon
f7f78039d2 Add tests for XShape extension API in configure,
and implements wxTLW::SetShape for wxMotif and wxX11
using the aforementioned extension.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 16:58:33 +00:00
Mattia Barbon
aae0472bf3 Use the wxBitmap implementation from wxX11
in wxMotif; solves various bugs related to wxMask
handling (and effectively adds a lot of wxMask
functionality previously missing).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 16:44:27 +00:00
Julian Smart
507db85d59 Include winable.h for NotifyWinEvent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 15:16:54 +00:00
Vadim Zeitlin
4f4d07644f update from NY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 14:48:04 +00:00
Michael Bedward
1eb9ddb9f8 Fixed TARGETDEF usage. Now defined in the parent make to use include a DEF file in the build. Is there some better way of doing this ?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-09 13:19:40 +00:00
Robin Dunn
6d460f765d Turn off all border styles for the inner window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 22:24:14 +00:00
Vadim Zeitlin
20e4242f93 yet another versionof Greek translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 18:51:36 +00:00
Mattia Barbon
c3b3654e9b Compilation fix for !wxUSE_TOOLTIP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 18:45:38 +00:00
Mattia Barbon
be8a703f96 Removed ".wxr fixes for Unicode" item, since wxr have been
removed from 2.6-to-be, and deprecated in 2.4.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 18:37:30 +00:00
Vadim Zeitlin
59a9a6bcc6 added missing default argument value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 13:52:31 +00:00
Vadim Zeitlin
2e491df9fa printf() format warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 11:28:57 +00:00
Vadim Zeitlin
c9ee09924f wxMac doesn't use wxTaskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-08 10:53:23 +00:00
Václav Slavík
4eb38db745 backported some things
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 22:17:13 +00:00
Václav Slavík
cf21abe595 deprecated XMLID and friends macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 22:15:03 +00:00
Stefan Csomor
643a0828da explicit app modality in SetModal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 20:37:30 +00:00
David Elliott
376c2fba79 After delete wxPendingEventsLocker; wxPendingEventsLocker = NULL; so that
the wxEvent code doesn't try to use it while cleaning up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 18:06:46 +00:00
Mattia Barbon
a29c6824c2 Add GetDrawable convenience function that returns m_bitmap
if the wxBitmap is monochrome or m_pixmap if the wxBitmap
is polichrome.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 17:39:00 +00:00
Mattia Barbon
1ca61fa7a7 No sashtest.xbm to be found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 17:35:22 +00:00
Mattia Barbon
02a48e3b0a Fix some GCC 3.2 -O2 warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 17:32:19 +00:00
Mattia Barbon
9ce8d6a2b0 Moved m_visual* wxApp[X11] members used by wxBitmap and
wxColour into a new wxXVisualInfo structure, and moved code
to initialize it to a new src/x11/utilsx.cpp file (utility
functions shared by wxMotif and wxX11).
  Added (currently unused) code in wxMotif to
retrieve wxXVisualInfo; it will be used when wxMotif
is switched to bitmap.cpp from wxX11.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 17:15:11 +00:00
David Elliott
13fc3db40e Do some sanity checks in DoDrawText to make sure we actually have some glyphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 04:04:10 +00:00
David Elliott
ce50c4d1c6 Added stub for wxIcon(const char **xpm)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 03:38:12 +00:00
David Elliott
2894667fa4 Relocate DeviceToLogical[XY], add stub for LogicalToDevice[XY]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 03:31:38 +00:00
David Elliott
64440d7734 Added preliminary resource fork support for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 03:14:35 +00:00
David Elliott
de6dab5f7c Allow wxUSE_DIRDLG and wxUSE_TREECTRL for wxCocoa (both are generic)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 03:05:24 +00:00
David Elliott
01f5f03e7f X11-specific code doesn't work so well on wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 02:57:12 +00:00
David Elliott
8d0eaedd07 Use the generic tree control for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 02:49:17 +00:00
David Elliott
b400d50ac6 There is no task bar icon for Cocoa (yet).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 02:21:10 +00:00
David Elliott
6c342f3ff1 Whoops! Might want the headers too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 01:44:11 +00:00
Vadim Zeitlin
e40bef9f54 option for using DirectX in wxDisplay
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 00:38:06 +00:00
Vadim Zeitlin
06efac1f8d support for optionnally using DirectX for display manipulations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 00:30:18 +00:00
Julian Smart
d515343ca2 Removed redundant fixme comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 20:47:59 +00:00
Mattia Barbon
b229c8a911 Remove (now) pointless checks for __WXX11__/__WXMOTIF__ in
src/x11/utils.cpp and src/motif/utils.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 20:39:45 +00:00
Julian Smart
06cc1fb991 Applied [ 716064 ] Second part of wxFileCtrl & wxDirCtrl patch
by John Labenski


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 19:57:51 +00:00
Vadim Zeitlin
5015e02267 fix bug with not accepting write-only formats in d&d
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 19:40:54 +00:00
Vadim Zeitlin
673e612079 merged 2 overloaded functions into a single membersections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 18:37:06 +00:00
Julian Smart
409bd44e7b More patches done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 17:59:59 +00:00
Vadim Zeitlin
efa14cf20a added assert to check that notebook page does have notebook as parent; removed duplicated AddPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 17:46:48 +00:00
Julian Smart
01562b11f2 Applied some of them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 15:48:34 +00:00
Julian Smart
edb247200c Reordered functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 15:14:50 +00:00
Julian Smart
5ae8a62ccf Removed backported fix from toback24.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 11:38:43 +00:00
David Elliott
1f6c4d4746 Changed dc.cpp to dc.mm and dcclient.cpp dcclient.mm for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 00:55:41 +00:00
David Elliott
891d0563f7 Replace dc.cpp with dc.mm and dcclient.cpp with dc.mm
Update app.mm to call wxDC text system startup and cleanup code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 00:54:38 +00:00
David Elliott
ec4e4a1415 Use the wxStaticBox::GetBordersForSizer method to get border information
on wxCocoa.  Perhaps the other ports should do this?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 00:51:44 +00:00
David Elliott
2ace5cf632 Added GetBordersForSizer(int *bordertop, int *borderOther)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 23:26:30 +00:00
David Elliott
ddf7346ac0 Commented out most the the wxLogDebug
Basic implementation of Refresh() does not take into account eraseBack or Rect


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 23:23:50 +00:00
David Elliott
c29e274378 Cocoa still uses the generic file dialog (see include/wx/filedlg.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 23:16:34 +00:00
David Elliott
82de126c11 Added declarations for NSLayoutManager, NSTextContainer, and NSTextStorage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 23:06:24 +00:00
Václav Slavík
842f5c94c9 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 22:30:39 +00:00
Václav Slavík
fb29dcac01 partially working wxTaskBarIcon for X11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 22:27:47 +00:00
Václav Slavík
3eae0c0b43 added taskbarcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 22:25:36 +00:00
Václav Slavík
4f5583b5c5 removed obsoleted virtuals from docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 22:22:01 +00:00
Václav Slavík
4bc6471261 updates to taskbar sample to use events instead of virtuals and work under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 22:20:52 +00:00
Julian Smart
b78ce094c7 Fix for getting all frames from GIF animation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 18:59:50 +00:00
Mattia Barbon
62ad3cb358 Derive wxBitmap from wxBitmapBase.
Move code from LoadFile/SaveFile/Create* to
bitmap handlers.
  Implemented wxBitmap::GetSubBitmap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 12:11:05 +00:00
Julian Smart
b71e94da10 Added a const for CW compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 10:38:18 +00:00
Chris Elliott
833e610da7 fix accidental overwrite of Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 10:34:19 +00:00
Julian Smart
a2f9a63688 APplied patch [ 705301 ] Don't send event for wxSplitter::Unsplit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 10:33:10 +00:00
Chris Elliott
ddea7eb614 changes to watcom makefiles for OpenWatcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-05 10:14:07 +00:00
Václav Slavík
6344162a81 removed files with empty stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 23:00:08 +00:00
Václav Slavík
f5b1bb5e76 preparation for X11 wxTaskBarIcon version:
1. moved events to common file from MSW specific
2. deprecated virtual functions in favour of event handlers
3. removed taskbar.cpp files from port that don't implement it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 22:47:58 +00:00
Václav Slavík
6af507f77e preparation for X11 wxTaskBarIcon version:
1. moved events to common file from MSW specific
2. deprecated virtual functions in favour of event handlers
3. removed taskbar.cpp files from port that don't implement it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 22:33:47 +00:00
Robin Dunn
4e6beae5ec Handle checkable items the right way in all cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 22:21:38 +00:00
Julian Smart
0a2c03984a Applied [ 714756 ] Clean warnings on build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 13:13:46 +00:00
Roger Gammans
a967f0480b * rename maxOnOverflow parameter to CoordToRowOrCol() to clipToMinMax
* ensure CoordToRowOrCol() range is  0 -> nMax if clipOnMinMax is set
                                and -1 -> nMax if clipOnMinMax is not set

 * check on uses of YToRow() / XToCol() and replace with
   calls internalYToRow() / internalXToCol() removing any external
   overflow handling where appropriate.

 * Add tests for overflow to prevent sending 'off grid' label events,
   would be indistinguishable from CornerLabel events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 21:14:07 +00:00
Robin Dunn
02822c8cdf Correction to my new menu code: handle submenus on menubar menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 21:01:52 +00:00
Vadim Zeitlin
6568015373 start of Greek translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 20:54:58 +00:00
Robin Dunn
a01fe3d6d2 Fixed menu event propogation to be consistent across platforms, and
with the docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 18:39:20 +00:00
Julian Smart
91ce04cf9e Fixed OnSetCursor for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 18:17:05 +00:00
Julian Smart
e5c4c38b5d Applied patch [ 709618 ] fixes drawing position in wxPrinterDC::DoBlit()
wxPrinterDC::DoBlit() in current CVS is drawing to the
source coords rather than the dest coords. This patch
corrects that.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 13:19:15 +00:00
Julian Smart
23254b138a Applied patch [ 708582 ] wxGenericFileDialog & expose generic wxFileCtrl
By John Labenski (jrl1)

The wxFileCtrl is a nice little widget that when
married with a wxDirCtrl makes for a simple, easy to
use explorer type widget.

include/wx/generic/filedlgg.h, src/generic/filedlg.cpp

Expose wxFileData and wxFileCtrl, rename wxFileDialog
to wxGenericFileDialog, it can be used in MSW now.

wxFileCtrl - added sorting for clicking in the col headers.
let wxGenericFileDialog manage it's own static text.
allow for viewing of root (for showing drives) in MSW
wxFileData - moved enum for wxFileCtrl col's into it.
added IsDrive and use bitmask instead of a slew of
bools for IsDir...

A couple bug fixes for wxFileCtrl for MSW, c:\.. is not
a file and can't be stated, show drives.

Basicly its the same as before, with no change besides
sorting for GTK. For MSW, the wxFileCtrl works in a few
more cases, hopefully all the MGL etc code was
untouched and should still work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 13:10:08 +00:00
Julian Smart
72c30d6572 Applied patch [ 706329 ] [wxMac] Fixes wxGetLocalTimeMillis
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 13:01:59 +00:00
Julian Smart
715d7d25b3 Applied patch [ 708016 ] Setup0.h updated according wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 12:58:46 +00:00
Julian Smart
5a618a14c6 Applied patch [ 708377 ] Make NET (smapi.cpp) UNICODE compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 10:42:56 +00:00
Julian Smart
333a6456b9 Fixed the wxX11 crash bug on opening a dialog that has a parent,
by only refreshing subwindows that are not top level windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 10:20:46 +00:00
Julian Smart
695c21b118 Unicode-enabled the STC sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 09:09:06 +00:00
Vadim Zeitlin
736f28f8d8 corrected description of auto-created wxConfig ownership (patch from bug 706868)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 23:20:21 +00:00
Vadim Zeitlin
49fca29840 backport wxFileConfig fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 22:16:59 +00:00
Vadim Zeitlin
128e0251fe fixed problem of deleting an entry added to an initially empty root group
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 22:16:23 +00:00
Vadim Zeitlin
3908fe9b00 corrected a slightly confusing wxTE_LEFT/CENTRE/RIGHT styles description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 21:21:25 +00:00
Mattia Barbon
d03bb63c48 Remove dulicated call to wxBitmap::Init/CleanupStandardHandlers,
which is already called from a module in bmpbase.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:59:59 +00:00
Mattia Barbon
be05eab690 wxMotif does not have wxBitmapDataObject.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:57:48 +00:00
Mattia Barbon
6799385e8c Partial fix for mono wxMemoryDC not working.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:55:33 +00:00
Mattia Barbon
395cb311cf Remove deprecated methods use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:52:47 +00:00
Mattia Barbon
236de6f62a No real change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:50:21 +00:00
Mattia Barbon
59e034c034 Make wxIcon more independent from wxBitmap implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:48:57 +00:00
Mattia Barbon
70aac632a1 Some updates for wxMotif documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 20:46:36 +00:00
Julian Smart
739e366ac9 Applied patch [ 705212 ] wxTextCtrl::SetSelection() for wxGTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 17:55:42 +00:00
Mattia Barbon
2408a0d514 Regenerated configure scripts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 17:18:40 +00:00
Julian Smart
8dda7c0c48 Applied [ 703017 ] TreeCtrl sample build fails when using generic control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 14:40:35 +00:00
Julian Smart
5e7ea8ebb2 Correction to last patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 14:25:23 +00:00
Julian Smart
3037523a7c Applied patch [ 700313 ] Allow wxUSE_OWNER_DRAWN = 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 14:18:51 +00:00
Julian Smart
873a543b62 Applied [ 700293 ] FL Unicode patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 14:14:13 +00:00
Julian Smart
db657fb29a Removed treectrl.h inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 13:54:01 +00:00
Julian Smart
6e9b4c7659 Applied patch [ 694561 ] FL Release build DLL include path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 11:15:10 +00:00
Julian Smart
083f7497d3 Applied some of patch [ 688466 ] MSVC7 build & bug fixes
by Darren Whobrey


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 11:10:37 +00:00
Stefan Csomor
baf3431445 better spacing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 08:32:19 +00:00
Stefan Csomor
aa812de01b setting origin to printable area for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-02 08:21:29 +00:00
David Elliott
8ea5271ee7 Implemented wxWindowCocoa::Cocoa_drawRect
Implemented drawRect override in wxPoserNSView
Declared pure virtual wxCocoaNSView::Cocoa_drawRect
Made wxWindowCocoa::Cocoa_FrameChanged protected (unrelated)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-01 17:59:54 +00:00
David Elliott
edd2522079 Changed defined(__DARWIN__) to (defined(__DARWIN__) && defined(__WXMAC__))
wxGTK running on Darwin certainly can not use the CF process callback
and I don't plan for wxCocoa to use it either.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-01 17:16:59 +00:00
David Elliott
b0abe9eeec Removed deprecated parser.o from cocoa.t, reran tmake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-01 16:44:48 +00:00
David Elliott
a6bc93cc74 Wrap file with #if wxUSE_SPINBTN instead of #if 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-01 15:50:40 +00:00
Václav Slavík
5c451707f3 XRC's unknown widget container handles removal of the widget now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 22:02:15 +00:00
Mattia Barbon
973ac5bbb2 Regenerated some more makefiles/filelists.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 19:33:06 +00:00
Mattia Barbon
dfa2a1d92b Removed Motif files that only contained stubs
for functionality that is:
1 - not Motif, but rather OS/WM specific:
    wxJoystick, wxWave, wxTaskBarIcon
2 - not provided natively by Motif:
    wxColourDialog, wxFontDialog, wxDirDialog,
    wxMetafile
3 - obsolete: wxTab*
4 - cruft: helpxxxx.h/cpp

  Regenerated configure and some filelist.txt-dependent
files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 19:23:10 +00:00
Mattia Barbon
e8508ea8a8 Removed a deprecated wxBitmap constructor, and some
more deprecated code. Move XCreateInsensitivePixmap to
bmpbase.cpp (another step towards removing
src/motif/bitmap.cpp).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 18:53:47 +00:00
Mattia Barbon
01772f64db Fix filelist.t to work with the packaged tmake.exe, which
does not include 'lib.pm'.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 18:49:50 +00:00
Julian Smart
df32effb39 Added 'deprecated' files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 16:19:31 +00:00
Julian Smart
3b69115cba More deprecated code updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 14:46:00 +00:00
Julian Smart
965b4f87d9 Removed old classes and functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 14:00:53 +00:00
Julian Smart
170e293d9f Added distrib file for deprecated classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 10:27:41 +00:00
Julian Smart
7c9955d147 More deprecated class mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 10:24:36 +00:00
Julian Smart
f2638c97a5 Deprecated lib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-31 08:09:56 +00:00
Julian Smart
2fc9385a2c Removing deprecated classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 22:47:33 +00:00
Julian Smart
642067e02a Removed treelay sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 22:21:37 +00:00
Julian Smart
7cb81afa43 Removed proplist sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 22:19:25 +00:00
Julian Smart
4b78db237a Removed resource sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 22:14:53 +00:00
Julian Smart
c6dafd93ca Deprecated library mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 21:55:34 +00:00
Julian Smart
3e3a8c40c5 Added project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 21:27:31 +00:00
Julian Smart
82e20720c9 Deprecated classes manual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 21:21:33 +00:00
Julian Smart
f3aa39c7ac Makefile for deprecated samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:48:54 +00:00
Julian Smart
4a3bdee6a9 New location for some deprecated files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:47:55 +00:00
Julian Smart
820893d0d4 New location for more samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:36:46 +00:00
Mattia Barbon
ed0c2af3ab No real changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:36:03 +00:00
Julian Smart
07831c160b New location for proplist sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:35:27 +00:00
Mattia Barbon
66f8b9ace2 Moved wxWindow::SetSizeHints implementation to wxTopLevelWindow,
where it belongs, verified that it works for wxDialog, too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:34:51 +00:00
Mattia Barbon
ccb234b4d0 Inherit LoadFile and SaveFile from wxTextCtrlBase, reduce
flicker caused by SetValue (the text itself still flickers a
bit, but now borders don't).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:32:00 +00:00
Mattia Barbon
fdfd5d49eb Removed dependency on wxTabView.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:29:14 +00:00
Mattia Barbon
79fb264130 More native look for wxSpinButton.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:23:10 +00:00
Mattia Barbon
973451afc6 Add bmpmotif.cpp to descrip.mms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:20:39 +00:00
Mattia Barbon
8768548b81 Create dialog with the correct style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:18:56 +00:00
Mattia Barbon
b1823f8b46 Applied patch [ 702254 ] Life: Fix to page scrolling
from Hugh Gibson.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 19:14:00 +00:00
Václav Slavík
d003330ce4 attempt to fix platform property problem on MacOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-30 15:56:31 +00:00
Stefan Csomor
31907d0307 unicode and __MACH__ additions for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 15:50:13 +00:00
Stefan Csomor
1940f66914 switching to as many MSL wchar implementations as possible for wxMac unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 15:44:56 +00:00
Stefan Csomor
64407854c1 cursor event support for mac activated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 15:40:46 +00:00
Stefan Csomor
ed4e170a7a mac unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 15:39:14 +00:00
Stefan Csomor
3470af1c9a fixed missing Idle events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 15:07:37 +00:00
Vadim Zeitlin
1cbf0cc6d3 start of Japanese translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 14:43:02 +00:00
Vadim Zeitlin
085c26ac14 updated Japanese translation, minor changes to the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 14:19:46 +00:00
Julian Smart
4a9dba0e56 Copyright cleanup
Added shaped sample to scripts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 13:53:55 +00:00
Julian Smart
f0f7bd8a4f Copyright cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 13:48:25 +00:00
Václav Slavík
6a87168b30 fixed bug #708570: Request 'silver' be allowed as a XPM value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-29 10:19:32 +00:00
Robin Dunn
3b3ca9beb8 Typo and compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 23:56:19 +00:00
Robin Dunn
dd1eb4e315 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 23:35:47 +00:00
Robin Dunn
2a73612989 Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an
empty stub for wxMac.
Added some generic helpers and a new ctor to wxRegion.
Added samples/shaped.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 23:34:06 +00:00
Robin Dunn
1542ea396a Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an
empty stub for wxMac.
Added some generic helpers and a new ctor to wxRegion.
Added samples/shaped.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 23:05:05 +00:00
Stefan Csomor
7728856b75 simplified definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 20:57:33 +00:00
Stefan Csomor
69a3ae88fc better mb2wc conversions for mac unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 20:55:23 +00:00
Stefan Csomor
2d2ed20f7b mach-o addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 19:18:51 +00:00
Vadim Zeitlin
a1e71b1032 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 17:41:02 +00:00
Stefan Csomor
2c1a331259 unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 17:30:20 +00:00
Stefan Csomor
84e7f94cb0 mach targets added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 16:26:15 +00:00
Stefan Csomor
e49079b2ab no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:36:41 +00:00
Vadim Zeitlin
34415ceaac backport wxFileConfig::DeleteEntry fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:32:46 +00:00
Vadim Zeitlin
7e0777dabb added test for wxFileConfig::DeleteEntry
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:28:57 +00:00
Vadim Zeitlin
3362e80e71 fixed deleting entries at root level
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:25:50 +00:00
Stefan Csomor
a2facb9415 bundle icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:22:08 +00:00
Stefan Csomor
e9a86b3c00 version support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 15:19:47 +00:00
Julian Smart
fe9c9eb022 Removed pointless Salford C++ support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 09:46:09 +00:00
Julian Smart
61bfe4b0ca Use wxDateTime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-28 09:15:01 +00:00
Václav Slavík
5175dbbd9f fixed DrawTextFormatted to work in O(n) instead of O(n^2) if the text doesn't fit into the column
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 23:21:47 +00:00
Stefan Csomor
427ff66291 wxMac Unicode support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:33:32 +00:00
Stefan Csomor
44c44c82a3 wxMac Unicode support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:21:51 +00:00
Mattia Barbon
3dd709d8c3 FIxed wxRadioBox::Get/SetLabel.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:17:27 +00:00
Stefan Csomor
c4e41ce37a wxMac Unicode support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:14:39 +00:00
Václav Slavík
76806f5906 fixed loading of resource from ZIP files on MacOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 20:06:20 +00:00
Mattia Barbon
aae91497f6 Removed some old cruft from wxBitmap, moved wxMotif- and
wxControl-specific functionality (GetXXXPixmap) into a separate
class, and fixed the implementation. Adapted wxStaticBitmap,
wxBitmapButton and wxToolBar to the new situation.
  Various fixes to wxToolBar: Realize does not create buttons
multiple times anymore, use the disabled bitmap as the disabled
bitmap, not as the toggled bitmap for toggle buttons (!),
reposition buttons/controls when a tool is removed/deleted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 19:40:32 +00:00
Mattia Barbon
fc7ca9b347 Made wxMotif Move/SetSize/DoMoveWindow/DoSetSize
behaviour more consistent with other ports. As a side effect
now wxCalendarControl works correctly under wxMotif, too.
  Fixed wxWindow::ScrollWindow drawing artifacts when child
controls are involved.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 19:34:10 +00:00
Vadim Zeitlin
9ec1ed2a7e corrected the test for number of processors under Linux
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 13:00:04 +00:00
Robin Dunn
2b9e4799b9 SWIGged updates for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 22:46:58 +00:00
Robin Dunn
3856ee0ba4 SWIGged updates for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 22:46:07 +00:00
Robin Dunn
3100de9921 SWIGged updates for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 22:45:47 +00:00
Mattia Barbon
2187eef5bb Calling a virtual function from a destructor is not good:
rearranged code to avoid it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 22:22:55 +00:00
Mattia Barbon
d8d1818419 SetSelection must not send an event. Fixed an off
by one index, and a crash (probably a Motif bug).
  Improved wxSpinButton appearance.
  Fixed some build warnings here and there in the samples,
removed use of deprecated wxList methods in prntdlgg.cpp, fixed
aot-of-range ID in tipdlg.cpp, fixed some errors detected by
valgrind.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 22:20:59 +00:00
Robin Dunn
6789bce964 Typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 21:58:31 +00:00
Robin Dunn
e0fb15a1c3 wxMac uses wxCursors now too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 21:57:43 +00:00
Robin Dunn
2d13837901 GetValue is pure virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 20:49:14 +00:00
Robin Dunn
bf78c81c04 wxImageHistogram needs WXDLLEXPORT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 20:43:09 +00:00
David Elliott
8b611f0eb2 Wrap file with #if wxUSE_SLIDER ... #endif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 19:59:07 +00:00
David Elliott
8dfc2d9896 Use #if wxUSE_GAUGE instead of #if 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 19:56:29 +00:00
Mattia Barbon
ba2fcb0711 Fix wxSocket under wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 18:32:58 +00:00
Mattia Barbon
51d5ec5408 Compilation fix for non-PCH compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 18:31:33 +00:00
David Elliott
c176a11a0e Changed #if wxUSE_NEW_GRID to #if wxUSE_GRID (there is no more new grid)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 18:09:28 +00:00
David Elliott
27397d6682 Implement wxExecute with proper callback on Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 17:53:12 +00:00
David Elliott
c8023fed76 - Added wxAddProcessCallbackForPid function
- Don't create pipeEndProcDetect on Darwin
- Initialize the wxEndProcessData before installing the callback
- Implement wxAddProcessCallbackForPid for Darwin, the code started life
  as an example from ADC and certainly has its fair share of race
  conditions, but with a few hacks it seems to be working okay.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 17:46:14 +00:00
Julian Smart
9c712743cb Correction to splittree; removed newgrid sample reference from index.htm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 14:13:07 +00:00
Vadim Zeitlin
e08a9b55e6 finally this translation uses traditional Chinese, not simplified (renamed old zh_CN)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 11:13:04 +00:00
Robin Dunn
a95e8d8b8c wxMac does need radiocmn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 04:10:06 +00:00
Robin Dunn
9cbf6f6ea3 Tweaks for various diffs from 2.4.0 to current HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 01:41:21 +00:00
Robin Dunn
fc0821b650 Fix broken binaries...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-26 01:26:38 +00:00
Robin Dunn
7e50db3f1d SWIGged updates for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 21:53:30 +00:00
Robin Dunn
7108497a54 SWIGged updates for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 20:37:50 +00:00
Julian Smart
1adff2f56f Use virtual functions to help splittree work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 18:49:34 +00:00
Robin Dunn
26b8693ba5 fixed compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 17:10:57 +00:00
Vadim Zeitlin
446a798ddc renamed Catalan and Chinese translations to the correct names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 11:47:45 +00:00
Julian Smart
bcd44ac1b0 Removed odbc.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 11:46:29 +00:00
Robin Dunn
230e09add6 Added file for xrc splitter support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 07:06:20 +00:00
Robin Dunn
b67a932778 SWIGged updates for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 07:04:05 +00:00
Robin Dunn
b9ac87bc5c Removed deprecation warnings in OGL and Gizmos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 06:58:05 +00:00
Robin Dunn
1e4a197e4c Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 06:35:27 +00:00
Vadim Zeitlin
9b4e3f352b call wxApp::OnExit() when wxExit() is called and don't do wxLogError from it (replaces patch 709142)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-25 01:51:11 +00:00
Vadim Zeitlin
f0fe27a041 added Catalan translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 23:12:45 +00:00
Vadim Zeitlin
d80f416f62 use StretchDIBits() if we're drawing a DIB and not a DDB in Blit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 23:10:41 +00:00
Vadim Zeitlin
2f52b4e15c use wxDIB class instead of duplicating DDB -> DIB conversion code once again (aaaargh, just how many copies of the same code with slightly different bugs in each case can we have??)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 23:07:53 +00:00
Vadim Zeitlin
cdd732de07 added test for Remove() and Replace() (patch 705051 from Nerijus)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 23:04:38 +00:00
Vadim Zeitlin
581ee8a9c5 implemented Remove() and Replace() for GTK2 (patch 705051 from Nerijus)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 23:03:19 +00:00
Vadim Zeitlin
82ac3b0a42 wxDIB::Create(wxBitmap) shouldn't do any conversions if the bitmap is already a DIB section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 22:58:50 +00:00
Vadim Zeitlin
9cf743aa7f oops, forgot default value for MemoryHDC ctor parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 22:48:54 +00:00
Vadim Zeitlin
697b08a89a MemoryHDC can now be used to create DCs compatible with arbitrary DCs and not just the screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 22:32:56 +00:00
Vadim Zeitlin
a8beba7230 fixed converting BI_BITFIELDS bitmaps to DIBs (fixes 589416)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 22:08:53 +00:00
David Elliott
a6b4ff2e62 Set the m_isShown flag appropriately from Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 21:41:49 +00:00
David Elliott
d449cf47c3 Use m_dummyNSView if necessary to get the superview frame for DoMoveWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 21:09:51 +00:00
Julian Smart
f40f9976fd Applied patch [ 705663 ] Fix capture mouse bug in wxGrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 21:00:11 +00:00
David Elliott
548dd93d7d Create an NSView in leiu of a radio box
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:55:15 +00:00
David Elliott
981af57ccf Create an NSView in leiu of a real listbox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:53:59 +00:00
David Elliott
576a15443d Use m_dummyNSView (if it exists) in place of m_cocoaNSView to retrieve the
superview's frame rectangle and this NSView's frame rectangle.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:38:40 +00:00
Vadim Zeitlin
0bcd741653 added wxTextBuffer::Clear() (patch 706188)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:37:27 +00:00
Vadim Zeitlin
5460b9e30b added non-const begin()/end() methods to wxString (patch 696842)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:32:55 +00:00
Vadim Zeitlin
17dd9caaa5 print dialogs ignore user paper settings in non C locale (patch 696835)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:31:24 +00:00
David Elliott
c1f7d193f6 CocoaRemoveFromParent can (and will) be called when !m_cocoaNSView.
However, if there is m_dummyNSView then there must be m_cocoaNSView.
Therefore, moved wxASSERT(m_cocoaNSView) inside if(m_dummyNSView)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 20:00:22 +00:00
Vadim Zeitlin
2b17e39106 don't unselect all radio buttons if there are 2 consecutive radio groups, just those in the second one, when its first button is pressed (bug 705441)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:54:13 +00:00
David Elliott
d5f229692e Create an NSView (in leiu of a real static line)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:34:48 +00:00
David Elliott
a8c80eb142 Create an NSView (in leiu of a real static bitmap class)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:33:50 +00:00
Vadim Zeitlin
72ad377f13 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:33:40 +00:00
Julian Smart
85b0fd7098 Reverted iodbc removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:25:03 +00:00
Vadim Zeitlin
925f154dac added a check for allowed id value (bug 690910)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:21:08 +00:00
Vadim Zeitlin
da32743f22 calling SetValue(GetValue()) didn't reset the modified flag (bug 678391)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:00:04 +00:00
Vadim Zeitlin
c5c04fabb0 fix Alt-letter navigation with spin controls (bug 672974)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:55:42 +00:00
Julian Smart
d8103d31f7 Removing newgrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:51:36 +00:00
Julian Smart
f7556ff05f Removed old grid code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:50:10 +00:00
Vadim Zeitlin
41aebd5d79 backport fix for bug 672894
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:19:34 +00:00
Vadim Zeitlin
0fa939c29a draw multiline labels in owner-drawn buttons correctly (fixes 672894)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 18:18:05 +00:00
Julian Smart
c5f5e891ec Fix by Milan Babuskov <albis@eunet.yu> in MovePageUp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 17:21:57 +00:00
David Elliott
acbf95340f - Remove wxTopLevelWindowCocoa from the wxRTTI class hierarchy
- DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa);


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 17:06:28 +00:00
David Elliott
08af0d25f9 !defined(wxUSE_TOOLBAR_NATIVE) changed to !wxUSE_TOOLBAR_NATIVE because the
configure script does define it to 0, not undef it (wxCocoa is using this)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 16:50:23 +00:00
David Elliott
9b4d9d5638 Enable the choice dialog on wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 16:07:34 +00:00
Julian Smart
09f6516cda Remove Install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 14:19:03 +00:00
Julian Smart
8c9a1303d8 Removing Install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 14:15:19 +00:00
Julian Smart
fa7e240226 Removing Install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 14:07:30 +00:00
Chris Elliott
4b1f929cc3 fix bug in Borland (bcc32 really hates ?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 12:47:41 +00:00
Chris Elliott
4c49b5d83e fix bug in Borland (bcc32 really hates ?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 08:44:08 +00:00
Vadim Zeitlin
810f173e8d removed wxUSE_IMAGE_LOADING_IN_MSW and wxUSE_RESOURCE_LOADING_IN_MSW settings, they're not used any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 21:36:43 +00:00
Vadim Zeitlin
2b254edf9c added wxDIB::Save() and wxDIB to/from wxBitmap) conversions, use them instead of the old C functions (the latter were removed, there is no old code left any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 21:33:21 +00:00
Julian Smart
26f0e9e2e4 Removed spurious spawnbrowser.h/cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:42:04 +00:00
Vadim Zeitlin
563e3ecb6c use call tmake to invoke tmake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:38:52 +00:00
Vadim Zeitlin
51a2a728e5 added GlobalHandle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:36:51 +00:00
Julian Smart
f7292ebeba Removed obsolete ODBC classes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:34:36 +00:00
Chris Elliott
2f8b6a1dcc fix reference to obsolete b32univ file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:26:05 +00:00
Julian Smart
2ab25aca26 Removed obsolete wxDate and wxTime classes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 20:14:19 +00:00
Julian Smart
621b931778 Klaas Holwerda <kholwerd@xs4all.nl> contrib/src/canvasOBSOLETE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 19:09:28 +00:00
Julian Smart
6ceef8efe9 Removed obsolete library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 19:06:57 +00:00
Julian Smart
ce109c530a Removed gaugemsw.cpp,h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 18:52:29 +00:00
Julian Smart
6aa855b9ec Removed 16-bit gauge code (Microsoft)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 18:49:12 +00:00
Julian Smart
767ed8fd8c Removed dibutils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 18:35:37 +00:00
Vadim Zeitlin
40c79fab3a use wxCLOSE_BOX for MyImageFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 18:02:05 +00:00
Vadim Zeitlin
da9df1f51e added copying images to/pasting them from clipboard tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 17:48:42 +00:00
Vadim Zeitlin
22be0335df got rid of more duplicated code for working with DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:51:37 +00:00
Vadim Zeitlin
5cb0f77dfe removed unneeded #include dib.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:46:50 +00:00
Mattia Barbon
3bb70c4026 Add missing header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:12:41 +00:00
Mattia Barbon
8f4b6405ff wxMotif does not have support for raw bitmaps.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:09:48 +00:00
Mattia Barbon
3c5bd1886a Added missing comma.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:07:48 +00:00
Mattia Barbon
1201b3ef40 Updated TODO and ISSUES.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:06:17 +00:00
Vadim Zeitlin
f2bb16493d removed GetBitmapForDC() and supporting functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 14:27:34 +00:00
Vadim Zeitlin
0b2e45b162 regenerated the makefiles with the latest filelist.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:56:46 +00:00
Vadim Zeitlin
474df21877 use wxDIB methods instead of old functions for working with DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:49:19 +00:00
Vadim Zeitlin
7fd328a34d use wxBitmapToHICON/CURSOR()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:48:15 +00:00
Vadim Zeitlin
c11bf84234 added CreateDDB() and CreatePalette()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:46:31 +00:00
Vadim Zeitlin
b0ea5d9603 added CopyFromDIB()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:45:37 +00:00
Vadim Zeitlin
a2f10a1768 removed curico files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 01:16:20 +00:00
Vadim Zeitlin
42b6a61ef6 Win16 cursor/icon functions are not needed any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 00:00:16 +00:00
Vadim Zeitlin
211b54b109 added wxBitmapToHICON/CURSOR helper functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 23:47:06 +00:00
Vadim Zeitlin
d1bf777402 suppress error messages when loading msimg32.dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:13:13 +00:00
Vadim Zeitlin
d35cb50456 update from Janos Vegh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:12:44 +00:00
Vadim Zeitlin
b3f04dc2b2 test raw bitmap access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:10:09 +00:00
Vadim Zeitlin
f28e099ec3 added (very) preliminary raw bitmap support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:09:33 +00:00
Vadim Zeitlin
2cf45d6944 modifications for raw bitmap support and for using DIBs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:02:05 +00:00
Vadim Zeitlin
bbc1265c40 create the DIBs in correct (and not down up) line order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:01:27 +00:00
Vadim Zeitlin
916b0ea345 added (very) preliminary raw bitmap support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 19:00:48 +00:00
Vadim Zeitlin
60a68e0024 backport Chinese locale fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 17:43:04 +00:00
Mattia Barbon
4d53042a6a Removed unnecessay code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 16:12:30 +00:00
Mattia Barbon
93e73c740e Do not derive wxCursor from wxBitmap, plus misc cleanup.
Derive wxGauge from wxGaugeBase, use XmScale for the
implementation if the Motif version supports the
XmTHERMOMETER style.
  Derive wxSlider from wxSliderBase; generate
wxEVT_SCROLL_THUMBRELEASE in addition to wxEVT_SCROLL_THUMBTRACK;
misc cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 15:46:22 +00:00
Václav Slavík
13de23f6d8 XRCID lookup now handles standard IDs correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 13:48:29 +00:00
Vadim Zeitlin
55427034af added GetName(), rearranged methods in alphabetic order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 13:42:16 +00:00
David Elliott
ac4eaadf80 Use wxBitmapBase in wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 07:45:38 +00:00
David Elliott
bc85826802 Regenerated by tmake: added all the cocoa source files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 07:15:48 +00:00
David Elliott
178b5412d1 Added wxCocoa files to build system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 07:10:44 +00:00
David Elliott
8029fe033c Use generic MDI for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:40:47 +00:00
David Elliott
e64df9bcc3 Include wxCocoa specific header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:18:36 +00:00
David Elliott
0201182bf5 Use generic implementation for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:13:03 +00:00
David Elliott
51a8edc7e6 Use the generic timer for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:07:53 +00:00
David Elliott
1a4ebaf865 Use the generic palette for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:07:11 +00:00
David Elliott
9a7324a6d9 Use the MSW/Mac font encoding info for wxCocoa (just to make wxCocoa compile)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:05:41 +00:00
David Elliott
e0ea95b6f7 Use generic font dialog for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:03:07 +00:00
David Elliott
f4515f987d - forward declare wxDC for use as a pointer or reference parameter in
wxDCBase methods
- Include wxCocoa specific header


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 06:00:12 +00:00
David Elliott
fed66a8797 - Modify #if to include wxCocoa as a platform using wxBitmapBase
- Include wxCocoa specific header


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 05:57:18 +00:00
David Elliott
ab590906ba - Include wxCocoa specific header
- Use the normal UNIX IMPLEMENT_WXWIN_MAIN macro


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 05:55:53 +00:00
David Elliott
a24aff654f FIXME: Complete stubs or other cruft necessary to make wxCocoa build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 02:56:04 +00:00
David Elliott
812edc2530 Added more files containing original code and empty stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 02:38:01 +00:00
David Elliott
94c3ff9091 Checked in WXWIN=$(WXDIR) hack as per Vadim's request
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-22 01:44:49 +00:00
Václav Slavík
27ef58ba02 fixed MSLU link
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 23:14:26 +00:00
Václav Slavík
8d512476c5 no need to check for 2.3.0 anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 23:12:29 +00:00
Vadim Zeitlin
ee9768c9e0 (real) compilation fix after previous commit(s)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 21:04:31 +00:00
Vadim Zeitlin
e38b6ea8d2 (blind) compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 20:40:40 +00:00
David Elliott
da0634c140 Added more original works and stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 20:25:09 +00:00
David Elliott
fb896a322a Added original works and stubs to CVS repository
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 19:51:47 +00:00
David Elliott
43225e09fe Various changes for wxCocoa
- Check for __WXCOCOA__ as an acceptable definition for a GUI
- Where __WXMAC__ is used to mean "running on a mac" check for
  one of __WXMAC__ or __WXCOCOA__
- Add the obligatory __WXCOCOA__ definitions section


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 17:09:18 +00:00
David Elliott
befdb27f7d Added wxCocoa files.lst. There are not yet any wxCocoa source files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 16:44:26 +00:00
David Elliott
71f23c9aa8 Generate src/cocoa/files.lst using the new cocoa.t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 16:29:17 +00:00
David Elliott
01ba8b3931 Add code to handle Cocoa, CocoaH, and CocoaR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 16:22:40 +00:00
David Elliott
aa2d605997 Added tmake template for wxCocoa, heavily derived from wxMac's mac.t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 16:19:22 +00:00
Julian Smart
e835c3693b Copyright correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 15:43:19 +00:00
Julian Smart
aa5973eef4 Copyright correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 15:30:17 +00:00
Julian Smart
a4ab8ed5ff Copyright correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 15:24:24 +00:00
Julian Smart
2e5794713c Copyright corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 14:36:39 +00:00
Julian Smart
17240438f2 Copyright correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 14:35:05 +00:00
Chris Elliott
db4444f0ce fix memory leak as Dimitri suggested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 10:10:16 +00:00
David Elliott
ac0c4cc396 Added support for building wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 05:13:45 +00:00
David Elliott
0e68a26a43 Added stub COCOA_DIST target with TODO comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 05:02:17 +00:00
David Elliott
39989a8093 Append .mm to .SUFFIXES list
Add .mm.o rule (exact copy of .cxx.o)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 03:27:39 +00:00
Michael Bedward
00524cfd67 Updated menu Appends to remove ambiguity that BCC complained about
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 03:23:27 +00:00
David Elliott
d9e2e4c242 Allow headers to be compiled in Objective-C++ mode
Changed id to one of:
winid   Window IDs and event system
itemid  Menu items
toolid  Toolbar items


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-21 02:58:55 +00:00
Mattia Barbon
6f87d5542d Changed g95.t according to my last changes to makefile.g95,
and regenerated it. Updated changes.txt.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-20 20:31:43 +00:00
Mattia Barbon
b994671df0 makefile.g95 now adds _cyg or _min suffix to libraries/DLLs, as
per the discussion on wx-dev.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-20 17:45:38 +00:00
Julian Smart
7ebcb58495 Added more things to remove; added a couple of wxGTK items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 21:40:05 +00:00
Julian Smart
a125b1b9d5 Removed conflict indicators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 19:20:44 +00:00
Julian Smart
09a1dffa32 Removed some deprecated usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 17:24:06 +00:00
Vadim Zeitlin
9750481f36 fixed bad overflow bug in wxX11 timer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 16:57:30 +00:00
Vadim Zeitlin
92ee0ef908 added simplified chinese translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 10:55:33 +00:00
Robin Dunn
dd360466a5 Applied a modification of Patch #704995 which changes how the lines
are drawn such that only the visible portions are drawn.  This is
because (I think) if the length of the line is > 32k then on at least
Win9x and GTK 1.2 the line will wrap around to the other end of the
tree ctrl...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 01:01:14 +00:00
Julian Smart
174046a33c Formatting tidy-up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-18 15:26:37 +00:00
Julian Smart
1cfa5d8e39 Some code tidying; removing dibutils.cpp which
doesn't seem to be used any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-18 15:08:21 +00:00
Václav Slavík
0f48e3d518 more LaTeX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 18:57:50 +00:00
Julian Smart
68fcaeb98e Added list of things to remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 17:14:04 +00:00
Vadim Zeitlin
13acdb7d36 some more details
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 16:14:01 +00:00
Julian Smart
6b9aec458f Corrected copyright
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 14:00:48 +00:00
Julian Smart
7818a75c16 Corrected copyright information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 13:41:00 +00:00
Vadim Zeitlin
355f240724 respect Veto()ing the column resize events; added test for this in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 13:24:45 +00:00
Julian Smart
6d89ddefa9 Corrected copyright
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 12:27:00 +00:00
Julian Smart
be55ddb10d Corrected copyright message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 12:22:02 +00:00
Julian Smart
1a19e369fb Fixed copyrights, corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 12:03:24 +00:00
Julian Smart
6aa89a22b8 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:55:54 +00:00
Julian Smart
55d99c7a77 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:28:33 +00:00
Julian Smart
e3a1e3e0e5 Fixed copyright and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:24:30 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Julian Smart
371a5b4e62 Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 10:34:04 +00:00
Julian Smart
3f0fac91ab Don't use images for wxNotebook because of crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 09:38:55 +00:00
Václav Slavík
0d7fb283bb backport SetFonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 23:09:51 +00:00
Mattia Barbon
d40708e2fd Fixed (native) wxComboBox::SetSelection and
wxListBox/wxComboBox::GetString.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:40:35 +00:00
Václav Slavík
b1ef882100 LaTeX compilation fixes again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:34:07 +00:00
Václav Slavík
4eecf1150d applied patch adding SetFonts to wxHTML printing classes and allowing NULL sizes list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:30:26 +00:00
Václav Slavík
5851504dfc fix wxrc-generated c++ code to work in Unicode mode (patch #704064)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:27:15 +00:00
Robert Roebling
cc3da3f8a1 Text attributes for GTK2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 13:47:47 +00:00
Robert Roebling
e136b74763 Better scrolling to cursor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 13:28:56 +00:00
Julian Smart
18efb19f9d Added RCS ID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 13:19:24 +00:00
Julian Smart
94af6953cf Tidied some wording, added configtool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 13:16:52 +00:00
Stefan Csomor
5e284dd5e8 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 10:13:20 +00:00
Mattia Barbon
ea9868e8d2 Derive wxBitmapButton from wxBitmapButtonBase + misc cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 08:50:21 +00:00
Mattia Barbon
3a73cc5203 Prevent wxChoice from resizing when items are added/deleted. Corrected
DoGetBestSize.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 08:41:04 +00:00
Mattia Barbon
d6379fa35a Add wxRTTI to generic wxDirDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-14 20:08:45 +00:00
Mattia Barbon
d3a80c922c Remove explicit casts to (const char *), and replace it with .c_str();
use wxConstCast instead of explicit casts to char*.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-14 20:07:03 +00:00
Chris Elliott
f72199d117 fix build for borland 5.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-14 10:47:51 +00:00
Michael Bedward
77fc3492f9 added TARGETDEF to use a def file if one exists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-14 09:09:13 +00:00
Vadim Zeitlin
441b8072ee backport wxFontEncoding values fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-13 22:05:16 +00:00
Robin Dunn
a8f473ac36 Prevent crash in case nothing is selected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-12 19:48:45 +00:00
Stefan Csomor
7ed2b47bf5 moved fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-11 19:52:48 +00:00
Robin Dunn
8aa2cea1d0 The statusbar should start with one field, not zero
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-11 00:01:03 +00:00
Robin Dunn
271d1110ed more informative error messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 23:58:30 +00:00
Robin Dunn
d8c65cf488 If zero time is specified, don't try to sleep when using a timer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 23:38:17 +00:00
Robin Dunn
fb718549cd Don't clear the HWND until after the UnsubclassWin so the old WndProc
will be restored.  Otherwise we get messages after the wxTextCtrl has
been destroyed.  (Forgot a few last time)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 23:32:18 +00:00
Robin Dunn
f3076f9fae Don't clear the HWND until after the UnsubclassWin so the old WndProc
will be restored.  Otherwise we get messages after the wxTextCtrl has
been destroyed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 23:28:40 +00:00
Vadim Zeitlin
39d6715fdf backport ParseDate() fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 22:43:45 +00:00
Vadim Zeitlin
62ae2780a8 accept \r as a delimiter when parsing dates (bug 684617)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 22:14:40 +00:00
Mattia Barbon
3e2d47e1a9 Added helper functions for string -> XmString conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 21:40:53 +00:00
Mattia Barbon
a63b009834 Derive wxButton from wxButtonBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 21:39:01 +00:00
Mattia Barbon
521196a26a Added configure test for const_cast<>(), and enabled it
for MSVC 5 and 6, and MinGW; use const_cast<>() in
wxConstCast if it is available.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 21:37:28 +00:00
Vadim Zeitlin
79e929e79e fixed a serious bug in Shrink()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 18:11:15 +00:00
Vadim Zeitlin
28cafc44d2 backport a couple of memory leak fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 18:08:59 +00:00
Stefan Csomor
d46342af50 submenu preparation in two methods encapsulated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 15:50:28 +00:00
Stefan Csomor
578dc95029 submenu preparation in two methods encapsulated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-10 11:57:27 +00:00
Vadim Zeitlin
c9570d3076 added gtk/msgdlg.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-08 14:36:27 +00:00
Mattia Barbon
84fb430b97 Reverted changes to make buttons smaller in wxMotif because they uncover
a bug in wxGTK, and, more importantly, thay will break user code under
Motif which uses sizers and calls wxButton::SetDefault.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-08 13:47:53 +00:00
Mattia Barbon
0ddf7c0cad Modified vc.t according to last changes to makefile.vc, and regenerated
makefile.vc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-07 16:03:15 +00:00
Mattia Barbon
fb5230de74 Removed some superflous #defines already added by plaform.h, simplified a bit
the logic to construct directory and library names; now it should be possible
to build in Unicode mode without changing setup.h; fixed building wxBase with
makefiles.
  Added a new DEBUGINFO parameter. FINAL=hybrid DEBUGINFO=1 is like
FINAL=hybrid but with debug information.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-07 15:48:41 +00:00
Stefan Csomor
ab89a5b59b show and hide implementation added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-07 10:25:11 +00:00
Stefan Csomor
e9d804ebea depth for masks added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-07 10:21:16 +00:00
Stefan Csomor
637988a4f6 change to a tiny minimal value for DoGetBestSize in case of existing entries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 21:38:12 +00:00
Stefan Csomor
8dd336cba3 added alpha channel support for mask bitmaps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 21:20:19 +00:00
Mattia Barbon
3ca22d5e92 Fix release build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 21:07:50 +00:00
Mattia Barbon
10d1f4131d Work around wxNotebook or Motif or wxMotif bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 17:52:41 +00:00
Stefan Csomor
0c2d357716 context menu support for mac enabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:56:06 +00:00
Stefan Csomor
7e0e5fe1e4 value expansion to double
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:38:19 +00:00
Stefan Csomor
63d1f74fe9 we now must skip right click events in order to allow for context events to be generated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:35:10 +00:00
Stefan Csomor
c4a49e11f7 the msw implementation even shows an ok button if it is not specified, we do the same
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:32:14 +00:00
Stefan Csomor
8950f7cc7e added OnMouse which will trigger context menu events, added better DoMenuPopup implementation which also deals correctly with check items, submenus etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:30:26 +00:00
Stefan Csomor
853f8094df added OnMouse which will trigger context menu events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-06 16:26:37 +00:00
Mattia Barbon
a87758e451 Fix warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 20:38:18 +00:00
Mattia Barbon
65ed018215 Document the new __WXMOTIF20__ preprocessor macro.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 20:36:48 +00:00
Mattia Barbon
b19a74b0bc Mentioned the need to set the WXDIR environment variable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 20:35:46 +00:00
Mattia Barbon
35af98e482 Applied patch [ 696990 ] fix makeg95.env so it can find version.mak
from Derry Bryson.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 20:21:32 +00:00
Mattia Barbon
da494b405d Added new __WXMOTIF20__ macro, which is true if the Motif version
is 2.0 or higher.
  Now Motif 2.0 or better (but not Lesstif) uses XmRenderTable instead
of the deprecated XmFontList. This allows underlined text in controls.
  Miscellaneous cleanup; used wxXmString in some more places.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 20:15:35 +00:00
Václav Slavík
bdb9ccbfd6 backport gtk2 mnemonics patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 18:10:06 +00:00
Václav Slavík
393cbb8ff7 fix compilation for GTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-05 15:58:10 +00:00
Václav Slavík
eaafd2f8b7 added support for GTK2 label mnemonics (patch #689573)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 23:34:52 +00:00
Vadim Zeitlin
53eff2a282 new wxDIB class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 02:15:29 +00:00
Vadim Zeitlin
336b8a4257 don't use GetSelectedInto() in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 02:14:13 +00:00
Vadim Zeitlin
acf8e3d29e start of alpha transparency support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 02:12:28 +00:00
Vadim Zeitlin
0c543b7a19 don't erase the background to see the transparent images better
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 02:10:27 +00:00
Vadim Zeitlin
9ae2ec95cf added wxDynamicLibrary::Detach()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-04 01:48:47 +00:00
Vadim Zeitlin
27bb2b7cea added support for reading alpha channel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 20:39:50 +00:00
Vadim Zeitlin
487659e0fa added alpha channel support to wxImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 20:33:40 +00:00
Vadim Zeitlin
c0589c62a6 added some macros to define version strings from version number (instead of having to manually update both)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 19:52:25 +00:00
Vadim Zeitlin
5169844ada added math.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 19:50:21 +00:00
Vadim Zeitlin
ddb4769e7c added wxUSE_DISPLAY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 19:49:37 +00:00
Stefan Csomor
c8ce283736 sorry previous commit message was wrong, should read
added shrink procedure with proper color averaging, it is triggered from scale in case the old with/height are multiples of the new width/height


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 15:35:52 +00:00
Stefan Csomor
fd9655adba overflow fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 15:30:20 +00:00
Stefan Csomor
534f031251 added shrink procedure with proper color averaging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 15:25:36 +00:00
Vadim Zeitlin
6627d4dfb7 compilation fix: include wx/platform.h before testing for __WIN32__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 02:15:55 +00:00
Vadim Zeitlin
652ab15353 fixed spurious assert in FindControl() (fixes patch 696147)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-03 00:00:52 +00:00
Vadim Zeitlin
7dc85fe2be added wxRect2DDouble == != = operators (patch 684616)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:44:56 +00:00
Vadim Zeitlin
a02afd1452 added wx/math.h (patch 686009)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:42:57 +00:00
Vadim Zeitlin
e49c85af1c added possibility to use several wxFileHistories (patch 685876)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:35:17 +00:00
Vadim Zeitlin
c5ef41d3b4 fixed memory leak (patch 696164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:24:28 +00:00
Vadim Zeitlin
1265e13d17 added missing include (patch 690352)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:21:53 +00:00
Vadim Zeitlin
2b293fc78f fixed memory leak (patch 685580)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 23:18:26 +00:00
Stefan Csomor
da804130ba GiveFeedback support, Cursor Extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:48:38 +00:00
Stefan Csomor
7541150812 OSX printing fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:47:37 +00:00
Stefan Csomor
42683dfb10 destroy event support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:46:44 +00:00
Stefan Csomor
2a61618831 usleep fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:45:53 +00:00
Stefan Csomor
c5e591789b xpm support, color cursor support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:44:08 +00:00
Stefan Csomor
78e053ec45 xpm support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:38:30 +00:00
Stefan Csomor
30727fae8d fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:37:08 +00:00
Stefan Csomor
5f7a6626aa added copy arrow cursor macos specific
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 22:35:42 +00:00
Robert Roebling
3352cfffbc Up-ported wxBusyCursor fix and wxCombBov default dialog
action behaviour if enter is hit in it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 21:34:32 +00:00
Gilles Depeyrot
653a3ed956 updated source to not use deprecated wxList methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 20:22:31 +00:00
Mattia Barbon
483561c568 Refactored wxStaticBox, and changed wxStaticBox and wxRadioBox border
style from sunken to the default Motif style.
  Added some convenience macros for checking Motif/Lesstif version.
  Fixed the bug that caused wxStaticBox size to change when label text
was changed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 20:08:45 +00:00
Gilles Depeyrot
a73903480f added missing include file and corrected memory leak due to creation of
never used region (NewRgn)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 19:57:47 +00:00
Václav Slavík
9ca4dd06de implemented wxCLOSE_BOX under Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 18:58:58 +00:00
Vadim Zeitlin
84267f0dfc added tests for changing display resolution and going full screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:38:03 +00:00
Vadim Zeitlin
e3612e8b54 added wxDisplay files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:31:56 +00:00
Vadim Zeitlin
c6985199b0 define some global wxDisplay-related stuff here (wxArrayVideoModes, wxDefaultVideoMode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:30:17 +00:00
Vadim Zeitlin
716645d361 maximize the window to the correct display (i.e. the one it is currently on); ShowFullScreen() actually shows the window, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:24:34 +00:00
Stefan Csomor
4a95c88547 OSX fixes for printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:23:20 +00:00
Vadim Zeitlin
8585e2b506 implemented video mode support (getting the current one, enumerating, changing)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:17:20 +00:00
Vadim Zeitlin
bfc9081049 significant API changes: wxVideoMode and methods using it added, GetDepth() and IsColour() removed, GetFromWindow() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 14:16:29 +00:00
Václav Slavík
af49404386 removed deprecated calls from wxImage example (bug #688438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 11:01:09 +00:00
Mattia Barbon
458ca8c1fd Implemented wxButton::DoGetBestSize for wxMotif. Now normal buttons
and default buttons are visually the same size, however, given how
wxMotif draws default buttons, the Widget for a default button is
bigger (8 pixels by default), thus setting default border will
make the Widget grow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-02 10:09:25 +00:00
Stefan Csomor
6b9eeef230 applied fix to MkDir for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 21:09:23 +00:00
Mattia Barbon
1119b89942 Do not change background colour for parent widget; set best size to
some arbitrary value if the text control is empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 18:05:33 +00:00
Mattia Barbon
866c0d96cb Fix "make install" for wxMotif after recent changes for using X11 files.
Fix "make dist" for all ports (changes in internat sample), and for
wxMotif (for the aforementioned changes).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 17:52:27 +00:00
Stefan Csomor
3b43289082 added minor and major description for wxGetOsVersion for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 17:30:38 +00:00
Stefan Csomor
3211bccf7c wxMac just using Update()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 17:13:57 +00:00
Stefan Csomor
913ff1a703 added wxMac to the branch using Update for refresh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 16:36:06 +00:00
Robert Roebling
1a44c9258a Added wxComboBox::SetString patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 10:00:29 +00:00
Robert Roebling
461573cc24 Upported combobox changes and another fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-01 09:59:27 +00:00
Julian Smart
e40298d54e Tidied space and tabs in wxMac files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:48:13 +00:00
Václav Slavík
7de24929eb 1. added native wxMessageDialog implementation for GTK+2
2. minor formatting changes, so that the changelog has consistent look


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:46:59 +00:00
Václav Slavík
cec773c6fc added native wxMessageDialog implementation for GTK+2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:46:41 +00:00
Václav Slavík
7f980cffb8 fixed wxScrollBar creation when default size was used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:41:00 +00:00
Václav Slavík
c5969a3848 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:39:46 +00:00
Václav Slavík
13a7abf973 added native wxMessageDialog implementation for GTK+2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:37:46 +00:00
Julian Smart
d921af5140 Tidied up white space and tabs in wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 23:36:37 +00:00
Julian Smart
072df0b3af Removed unnecessary #ifs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 22:23:25 +00:00
Mattia Barbon
79132cd302 Change wxCLOSE to wxCLOSE_BOX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 22:09:14 +00:00
Julian Smart
a31a5f8534 Tidied copyright and date for wxMac files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 21:54:04 +00:00
Julian Smart
7532d2928e #ifed wxLog occurrences
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 19:30:22 +00:00
Julian Smart
f81387bd80 Added display sample to distrib file lists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 18:04:10 +00:00
Vadim Zeitlin
e9b77bccb0 added FromPoint test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 01:48:47 +00:00
Vadim Zeitlin
c32b107789 started writing wxDisplay sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-28 01:33:55 +00:00
Robin Dunn
402ce75571 Patch from David Falkinder to help building a STC dll.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 21:10:20 +00:00
Vadim Zeitlin
d264d7091c show error message if exec() failed: not pretty but better than nothing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 18:20:38 +00:00
Vadim Zeitlin
3cdf176163 fix bug with timezone calculations when WX_GMTOFF_IN_TM si true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 13:01:29 +00:00
Vadim Zeitlin
c54322338f fix bug with timezone calculations when WX_GMTOFF_IN_TM si true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 12:53:03 +00:00
Vadim Zeitlin
647b8e379e wxExecute may only be called from the main thread
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 12:18:07 +00:00
Vadim Zeitlin
9e023db73b updated the sample to show the sizers, not constraints, in the main frame; also demonstrate flex grid sizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 12:02:22 +00:00
Vadim Zeitlin
e8800dcfa7 added proportion parameter to wxFlexGridSizer::AddGrowableRow/Col()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 11:55:26 +00:00
Vadim Zeitlin
702c420889 added WXK_WINDOWS_XXX key constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 11:51:41 +00:00
Vadim Zeitlin
8a09029e0c added wxUSE_DISPLAY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 10:30:35 +00:00
Stefan Csomor
7854746ec1 fix for SetSize was missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 10:18:16 +00:00
Václav Slavík
850c6ed46e wxCLOSE->wxCLOSE_BOX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 10:13:26 +00:00
Stefan Csomor
d60de5167e SetValue can add values if not readonly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 10:06:12 +00:00
Vadim Zeitlin
62b4ae0811 fixed wxRegionIterator example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-27 00:18:43 +00:00
Václav Slavík
9ef896e152 unified default values for conv arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 23:10:36 +00:00
Václav Slavík
72cd2fcc00 updates to <script> handling backport list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 23:09:25 +00:00
Václav Slavík
d3c0ce3402 unified default values for conv arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:31:44 +00:00
Václav Slavík
07cc7ddca5 compilation fix for optimizing compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:29:21 +00:00
Václav Slavík
7c6ad433be added wxCLOSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:26:31 +00:00
Václav Slavík
c3d8ee42db added wxCLOSE and fixed wxSYSTEM_MENU on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:24:19 +00:00
Václav Slavík
f1a19f1478 added wxCLOSE and unified wxDEFAULT_DIALOG_STYLE definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:21:47 +00:00
Václav Slavík
eeb029a965 fix patch #693600
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:21:02 +00:00
Robin Dunn
9230920176 Changed how the dynamic event tables (used for all Python wx classes,
C++ wx classes typically use static event tables) are searched such
that they behave from a Python perspective more like the static tables
in C++.  Namely that if there are identical event bindings in a base
Python class and a derived Python class that the one in the derived
class will be found first and that if Skip is called that the one in
the base class will still be found instead of skipping directly to the
static stable in the C++ class.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 21:22:44 +00:00
Vadim Zeitlin
a9d3434a3b finally fixed the flicker problem in wxTE_RICH[2] text controls when appending a lot of text to them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 18:44:20 +00:00
Vadim Zeitlin
07601f5945 don't log erroneous error messages when writing an empty string to a wxTE_RICH2 control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 16:48:50 +00:00
Vadim Zeitlin
4756503a3d fixed typo in WX_DECLARE_OBJARRAY example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 16:14:30 +00:00
Vadim Zeitlin
77b0d411e3 fixed typo in he check in SetSizeHints()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 16:12:42 +00:00
Vadim Zeitlin
bad93b357f forward declare wxMenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 12:43:06 +00:00
Vadim Zeitlin
5315ebfaed test for the bug with showing a modeless dialog from a modal one in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 12:33:35 +00:00
Stefan Csomor
e549bec483 m_y of generic tree item was only a short, which unnecessarily limits the number of items that can be displayed and handled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-25 09:48:30 +00:00
Vadim Zeitlin
34b6a45ab9 centralize version info in one file, include it from all makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 23:20:22 +00:00
Vadim Zeitlin
117395866e do use micro version number in the DLL names -- but in the unstable branch only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 23:19:21 +00:00
Vadim Zeitlin
817f640621 use jast major.minor, not major.minor.micro, in the DLL names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 00:33:28 +00:00
Vadim Zeitlin
a6861c1dc8 get the version info directly from wx/version.h instead of hardcoding it here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 00:26:50 +00:00
Vadim Zeitlin
ca1aac5387 regenerated using the correct versions in/for the DLLs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-24 00:25:08 +00:00
Václav Slavík
6b8877197f backport CDATA code in wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 23:11:23 +00:00
Vadim Zeitlin
10e8e34f71 note warning against using /ox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 21:59:26 +00:00
Mattia Barbon
e1aae52885 Implemented DoGetBestSize for wxListBox, (native) wxComboBox and
wxTextCtrl, and used it when wxSize(-1, -1) is passed to Create, to set
the initial size.
  Added wxDoChangeFont and wxXmStringToString helper functions, removed
the use of m_stringList in native wxComboBox, removed some duplicated code
in wxWindow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 20:33:43 +00:00
Vadim Zeitlin
8dcc14725d removed the extra offset in moveto in DrawRotatedText() (why was it there?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:57:45 +00:00
Mattia Barbon
d4d46b56f0 Allow setting default file name in wxMotif wxFileDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:24:45 +00:00
Václav Slavík
1da51aafba make wxConvUTF8 available in wchar_t-less mode, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:01:54 +00:00
Václav Slavík
4561e95d96 documentation for wxFileConfig changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:01:41 +00:00
Václav Slavík
67de05a11c wxFileConfig in Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:01:29 +00:00
Václav Slavík
8829fa8200 implemented empty handler for <script> tag, so that script code doesn't show in rendered page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:00:08 +00:00
Václav Slavík
7c6cd4a86b fixed parsing of CDATA elements (<script> and <style>) (Bill Nalen)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 18:59:13 +00:00
Vadim Zeitlin
749caeeb38 documented wxGetApp()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 02:03:41 +00:00
Chris Elliott
ec8b106913 update watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-22 15:42:49 +00:00
Mattia Barbon
e74bade6d8 Added Active Accessibility files to filelist.txt, regenerated
wxWindows.dsp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-21 21:27:53 +00:00
Robin Dunn
5aab763c09 Only send two EVT_BUTTON events when double clicking a button, not three
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-21 20:27:56 +00:00
Julian Smart
010ba10dc5 Applied FL patch from Stefan Kowski
"Enclosed there is a patch for the FL library that solves a problem
overwriting the status bar if a bar is expanded.

Cause of this is the calculation of the new window height which may be less
than 0 in some cases. In my test a value of -1 caused the window default
height to be set which was larger than the space available, therefore the
status bar was overwritten."


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-21 16:02:33 +00:00
Mattia Barbon
0a514d12e8 Regenerated files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-20 18:30:06 +00:00
Mattia Barbon
69c4481222 Use some wxX11 files (currently pen.cpp and brush.cpp) in wxMotif.
Add src/x11 to VPATH in configure, and add a new flag to filelist.txt
indicating a file used in wxMotif but not in wxMotif directory.
  Modifed VMS makefiles, too (should be checked by someone with VMS,
though).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-20 18:20:47 +00:00
Václav Slavík
e7370dac93 fixed wxSYS_DEFAULT_GUI_FONT lookup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 23:17:01 +00:00
Mattia Barbon
729be74dd1 Fix DrawRotatedtext to behave more like wxMSW: take into account
text background colour, and fix some wrong mathematics which caused
incorrect results.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 21:12:00 +00:00
Julian Smart
9dc8c75994 Temporary fix for strange wxDateTime link error with VC++ and wxUSE_ACCESSIBILITY=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 21:06:52 +00:00
Mattia Barbon
21342bba68 Allow selecting a mono bitmap into a wxMemoryDC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 21:06:02 +00:00
Václav Slavík
3ebd765df5 fixed Traditional Chinese mapping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 19:25:47 +00:00
Vadim Zeitlin
2862acdeb7 removed several out of date/wrong sentences; mention wxEvtHandler::Connect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 18:54:07 +00:00
Julian Smart
2aefc52854 Further tweaks to accessibility code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 16:31:28 +00:00
Vadim Zeitlin
af7b5345ed use -O0 when optimizing is off -- seems to __slightly__ reduce the build times with g++ 3.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 13:52:11 +00:00
Vadim Zeitlin
e587e144c8 prevent from setting min[WH] > max[WH] because this leads to an infinite loop later on and generally doesnt make sense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 13:44:32 +00:00
Vadim Zeitlin
3cfda0b764 fixed a typo which was preventing any events from being generated after DeleteAll() call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 13:15:50 +00:00
Robin Dunn
7de595519a Send the wxWindowDestroyEvent for all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-19 02:59:36 +00:00
Mattia Barbon
8b49ecd77a Patch [ 688973 ] from William Gallafent: add missing wx/dc.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 21:33:43 +00:00
Julian Smart
038a5591e4 Fixed warning, reformatted some code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 15:39:23 +00:00
Julian Smart
d43851f77e Applied patch [ 608866 ] wxGrid: vertical column label text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 14:25:34 +00:00
Robert Roebling
0878fb4c7d Applied John's patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:48:55 +00:00
Julian Smart
2cdd094b12 Applied patch [ 681921 ] Stray focus rectangle in static text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:40:30 +00:00
Julian Smart
a8f4cabe1e Applied patch [ 681893 ] Combobox in toolbar
This patch adds controls (i.e. combobox) to toolbars.
It also changes the toolbar sample so the combobox is
actually shown.

Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:38:02 +00:00
Julian Smart
8586126c7b Enhancements to the accessibility sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:35:14 +00:00
Julian Smart
c6e2af4570 Some improvements to accessibility behaviour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:33:42 +00:00
Julian Smart
787d22ec24 Applied patch [ 686843 ] File Dialog Wildcard Bug
A bug was introduced in generic/src/filedlgg.cpp
between versions 2.2.9 and 2.4 that causes incomplete
file extensions to be appended to filenames not having
extensions after a user changes the wildcard index in
the filedialog. This patch reverts back to the correct
code.

Bob Downey


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:27:23 +00:00
Julian Smart
e6396ed451 Applied patch [ 681262 ] Add EVT_MENU_OPEN support for GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:02:30 +00:00
Julian Smart
e0496eaaa4 Changed back inline/const things
wxTabCtrl must have WS_CHILD window style
small access.cpp tweaks (call QueryInterface)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-17 12:43:47 +00:00
Julian Smart
ae23a52a16 Added start at accessibility sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-17 10:15:02 +00:00
Václav Slavík
b1ef887ad8 another compilation fix for over-optimized #includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-16 23:08:33 +00:00
Gilles Depeyrot
904a2463aa fix wxDateTime offset for Apple Developer Tools (SourceForge bug # 614010)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-16 18:19:15 +00:00
Vadim Zeitlin
e38ed919ba inserted casts allowing to have arrays of function pointers -- this is wrong but works on most platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-16 17:46:05 +00:00
Julian Smart
ed5317e538 Added start at accessibility functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-16 11:59:49 +00:00
Julian Smart
45a959a33b Added accessibility headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-16 11:57:24 +00:00
Julian Smart
57b486583d VC++ 6 doesn't seem to like the uninlining thing and
also the wxDateTime::TIME_T_FACTOR must be always defined;
else we get link errors. I don't know why these didn't
turn up before...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-15 17:14:19 +00:00
Stefan Csomor
e56aba8dd5 Files from a Drop were only added but the fileslist never cleard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-15 08:36:30 +00:00
Mattia Barbon
73d33f1ac6 Setting background colour on listbox parent makes it look ugly, do not
do it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-14 20:43:53 +00:00
Mattia Barbon
369da72455 Fix wxEventLoop so it does not sleep 20 msec between events when threads
are anabled. Now the ode should be equivalent to the 2.4 event loop.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-14 20:41:57 +00:00
Vadim Zeitlin
b1e343f2bb silent gcc warning about missing \n at the end of file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-14 20:21:00 +00:00
Vadim Zeitlin
22cbd10ea3 compilation fix (missing header)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-14 20:19:49 +00:00
Chris Elliott
63d6802445 fix for watcom open compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 20:57:11 +00:00
Julian Smart
80793cda3e DOc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 18:28:36 +00:00
Vadim Zeitlin
6faf4b5f59 say that WarpPointer() is not supported under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 13:16:58 +00:00
Vadim Zeitlin
41e6092432 marked dbkeyg.h as a wxBase file (fixes 685857)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 11:34:07 +00:00
Jouk Jansen
c18670e45c Committing in .
Roving class reference within the class itself.

 Modified Files:
 	wxWindows/src/univ/combobox.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 07:21:50 +00:00
Vadim Zeitlin
a08e7186b4 added an assert checking that Resume() is not called unnecessarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-13 00:22:36 +00:00
Chris Elliott
6bc5a86729 first watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 22:17:08 +00:00
Chris Elliott
366e20d6fc fix watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 21:25:54 +00:00
Chris Elliott
d3abc823be fix watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 21:16:56 +00:00
Chris Elliott
d8bb3c9c64 improve watcom makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 21:01:20 +00:00
Chris Elliott
9c11ecdbed fix unused vars for watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 20:58:58 +00:00
Václav Slavík
c3d15542d6 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 20:35:27 +00:00
Mattia Barbon
08e5319b03 Implemented wxToggleButton under Motif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 18:20:23 +00:00
Vadim Zeitlin
9045ad9dfc added DoSetNativeFontInfo() to avoid virtual function hiding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 15:42:27 +00:00
Vadim Zeitlin
bf3353768a removed redundant code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 11:42:11 +00:00
Vadim Zeitlin
7899ef9592 fixed typo in SetToolClientData() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 22:55:40 +00:00
Mattia Barbon
6db2faf3ad Remove another already backported change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 21:26:10 +00:00
Mattia Barbon
4df410bf5c Remove already backported change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 21:16:23 +00:00
Mattia Barbon
8e7361ccbc Changes to be backported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 21:09:05 +00:00
Mattia Barbon
100f92893d Finished native wxComboBox implementation; it still needs some testing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 17:51:28 +00:00
Julian Smart
b6e2df0b36 Added an item to toback24.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 15:50:59 +00:00
Robert Roebling
6185050104 Minor corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 11:20:45 +00:00
Chris Elliott
1a55595e69 fix contrib makefile for watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:55:23 +00:00
Mattia Barbon
fd52ec657f Clearly mark wxGLCanvas as not working under wxX11.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:27:24 +00:00
Mattia Barbon
5c0ee4a80a Fix compilation with GCC (at least 2.95.4).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:18:32 +00:00
Mattia Barbon
67a26a1a0b Fix compilation after last fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:12:55 +00:00
Mattia Barbon
ed39ff57b3 Remove unnecessary header dependencies. Fix resulting compilation
problems for wxMSW, wxGTK, wxMotif, wxX11 and wxMac in default
configuration. Non-default configurations will probably need some more
fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:07:36 +00:00
Chris Elliott
d51f2e6587 fix for making libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 20:43:39 +00:00
Stefan Csomor
2ad50cc75b bug fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 19:15:13 +00:00
Vadim Zeitlin
cfef519aaa scrolbar event orientation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 16:16:14 +00:00
Vadim Zeitlin
27e229f55a set orientation for scrolbar events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 16:11:55 +00:00
Robert Roebling
d9e403cc40 Support underscroes in menu item names under GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 10:13:58 +00:00
Vadim Zeitlin
91388efc15 use bigger than default page size to avoid 'library too big' errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 22:03:49 +00:00
Vadim Zeitlin
3e43d6143b added missing const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 21:26:22 +00:00
Vadim Zeitlin
111ee2fdb8 fileconf stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 21:22:47 +00:00
Vadim Zeitlin
bc33be3b05 don't trigger an assert in wxFileConfigGroup::DeleteSubgroupByName() if the group doesn't exist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 21:17:18 +00:00
Mattia Barbon
2b830c41f7 Do not use stipple when drawing text, use solid foreground/background
colour instead.
  Use XSetTile/FillTiled instead of XSetStipple/FillStippled, otherwise
BadMatch errors occur in wxDC::SetBrush.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 20:21:54 +00:00
Mattia Barbon
b64c979322 Replaced wxDebugMsg with wxLogError.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 17:05:24 +00:00
Stefan Csomor
1c52210086 clipboard extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 09:11:43 +00:00
Stefan Csomor
2eefc6d59e crash upon hide fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 09:10:02 +00:00
Stefan Csomor
0e878cfcc6 code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 09:08:09 +00:00
Stefan Csomor
6ef7c8e01e native tooltips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 09:04:18 +00:00
Stefan Csomor
6dbc7fb4e5 redraw changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 09:01:05 +00:00
Stefan Csomor
81b41c03c6 code changed along msw lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 08:56:54 +00:00
Stefan Csomor
07c76470e9 corrected disposal for b/w cursors and creation and disposal of colour cursors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 08:54:08 +00:00
Stefan Csomor
d1e3f88a08 mask and hotspot corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 08:23:08 +00:00
Stefan Csomor
2a391f8718 clipboard bitmap support extended
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 08:19:28 +00:00
Stefan Csomor
9c3c584918 clipboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-09 08:15:35 +00:00
Chris Elliott
9d1461a451 remove references to 16 bit compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-08 11:50:09 +00:00
Jouk Jansen
bf91e65285 Committing in .
wxMotif changes for OpenVMS

 Modified Files:
 	wxWindows/src/motif/descrip.mms
 	wxWindows/src/motif/evtloop.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-07 07:27:30 +00:00
Vadim Zeitlin
80e297514d corrected several errors when generating project file with all configs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-07 02:56:49 +00:00
Julian Smart
4fedd384a1 Moved ffile inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 14:07:45 +00:00
Robin Dunn
ca7353de3a Check the image height when calulating the line height. This allows
larger than normal images to be used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 02:18:51 +00:00
Vadim Zeitlin
e2b87f38d9 allow compilation with wxUSE_DATETIME == 0 (patch 679822)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 00:53:46 +00:00
Vadim Zeitlin
83911a5a4d compilation fix for WXWIN_COMPATIBILITY_2 == 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 00:51:15 +00:00
Robin Dunn
895066d8c8 Scintilla uses a -1 index to unselect, we need to catch that.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-05 23:30:36 +00:00
Vadim Zeitlin
debc914bdc fixed typo in the label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-05 12:17:18 +00:00
Vadim Zeitlin
4f5a7f7409 HP-UX fixes: use INSTALL_DIR as install doesn't have -d option; fixes for threads compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-05 00:54:04 +00:00
Stefan Csomor
d8e9da78a0 added hints from QA 1061
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 22:30:58 +00:00
Stefan Csomor
a19f009bce OSX native tooltips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 22:27:54 +00:00
Stefan Csomor
04f2e99050 carbon event savvy wakeup call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 22:25:21 +00:00
Mattia Barbon
1845da40f2 Update with recent changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 21:57:55 +00:00
Mattia Barbon
49bbd59b01 Do not redeclare a struct (w32api 2.2 will have it).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 21:37:58 +00:00
Mattia Barbon
9b1bd0c6e7 Applied patch [ 679397 ] remove GPL code from motif build
from Ian Brown, with some modifications; this patch replaces the (GPL)
Motif ComboBox with an implementation based on the native (for Motif 2.0)
ComboBox. The old ComboBox is still used as a fallback for older Motif
versions. My modifications include some method's implementation and
some workarounds for LessTif.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 21:09:03 +00:00
Vadim Zeitlin
205b0c9c6a try to create smaller executables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 20:34:43 +00:00
Vadim Zeitlin
9d1e1be463 added wxLocale::FindLanguageInfo()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 16:43:10 +00:00
Vadim Zeitlin
677a9e28b5 fix for warnings when wxUSE_RESOURCE_LOADING_IN_MSW == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 00:57:47 +00:00
Vadim Zeitlin
f6eff86e7e added Watcom mention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 00:56:28 +00:00
Vadim Zeitlin
d4c8e4a1d4 corrected the value of EUC_JP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-04 00:54:46 +00:00
Václav Slavík
e4d47fbd6f fixes to ShowFullScreen (KDE 3.1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 23:31:55 +00:00
Václav Slavík
1cff04deb5 fixes to ShowFullScreen (KDE 3.1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 23:23:05 +00:00
Vadim Zeitlin
a2f26963ba added (woefully incomplete) Japanese translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 23:09:13 +00:00
Mattia Barbon
ac856b274a More changes to be backported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 22:45:05 +00:00
Mattia Barbon
bf60426831 Make wxr resources work in Unicode mode.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 22:39:02 +00:00
Mattia Barbon
94311eef78 MSVC 5 does not have BIF_EDITBOX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 22:35:42 +00:00
Mattia Barbon
00dd3b1897 Do not #include an header where a forward declaration suffixes. Do not
include wx/wx.h directly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 20:56:40 +00:00
Jouk Jansen
ff7d1dcb82 Committing in .
One #undef for OpenVMS only

 Modified Files:
 	wxWindows/src/gtk/app.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-03 12:51:34 +00:00
Vadim Zeitlin
7f88f624d6 changed C++ comments in C comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 22:54:04 +00:00
Vadim Zeitlin
0aa35d1962 fixed First() signatures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 22:21:28 +00:00
Mattia Barbon
1092b2a039 Mark for backporting.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 21:01:54 +00:00
Mattia Barbon
d76240bfe1 Fix client data handling: delete client data for all items when a
wxChoice is deleted, delete client data for an item when that item is
deleted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 21:00:06 +00:00
Stefan Neis
ab9f788e31 Some OS/2 specific improvements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 20:31:27 +00:00
Vadim Zeitlin
f083414031 compilation fix for wxUSE_RESOURCE_LOADING_IN_MSW == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 18:31:23 +00:00
Mattia Barbon
7e1bcfa80e Implemented wxEventLoop for wxMotif, and used it in wxDialog::ShowModal,
wxWindow::DoPopupMenu and for the application main loop.
  Implemented wxWakeUpIdle.
  Fixed crash when a popup menu entry is used to close/destroy the parent
window of the menu.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 15:48:50 +00:00
Vadim Zeitlin
d894c20113 compilation fix for non-PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 15:20:35 +00:00
Vadim Zeitlin
766c5e24a5 added Unicode build configurations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 15:19:11 +00:00
Julian Smart
9cb98d8995 Applied patch [ 678788 ] Dialog command event propagation problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 15:07:57 +00:00
Vadim Zeitlin
01feccc204 the Russian translations were somehow corrupted, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 15:02:17 +00:00
Julian Smart
f2b99f6323 Applied patch [ 675376 ] Improves wxStaticBoxSizer
(uses GetCharHeight() instead of guessing).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:58:56 +00:00
Julian Smart
6f7c5199ed Applied patch [ 677730 ] Menus with radio items (wxUniv)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:50:05 +00:00
Julian Smart
e2ca829e7d Applied patch [ 670782 ] Combobox uses popup window width
(wxUniv)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:47:04 +00:00
Julian Smart
61a83c1c50 Applied Patch 664399: wxButton default size should not be adjusted
(wxUniv)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:39:55 +00:00
Vadim Zeitlin
f68c6b523c Unicode compilation fixes after wxFFile change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:17:41 +00:00
Vadim Zeitlin
c48e9cbb17 unused any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:14:08 +00:00
Vadim Zeitlin
017fcf32be allow choosing language from the command line; small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:09:36 +00:00
Vadim Zeitlin
fb6e5b179a more std iostream + Unicode fixes; copy streams in blocks of 4Kb, not char by char
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 13:29:50 +00:00
Vadim Zeitlin
90e2cbf780 use wxChar, not char, for the second argument of Open() and also use wxFopen() in the implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 12:46:33 +00:00
Vadim Zeitlin
9c9c3d7a8f indicate whether this is a selection or a deselection in wxCommandEvent generated by a multiselection wxListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 03:05:41 +00:00
Vadim Zeitlin
cf41e1a4d5 (blind) fix for compilation in standard iostreams + Unicode mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 02:40:17 +00:00
Vadim Zeitlin
eff4ffbf4f big wxCursor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 02:06:34 +00:00
Vadim Zeitlin
62a0bb2788 removed wxCURSOR_SIZING (we now use the std one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 01:50:07 +00:00
Vadim Zeitlin
cf54972ea2 unsuccessful attempts to create resizable dir dlg without new folder button; added BIF_EDITBOX style; minor code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 00:38:09 +00:00
Vadim Zeitlin
367f7c4570 what do we need a separate (from m_windowStyle) m_dialogStyle here for? removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 23:30:53 +00:00
Vadim Zeitlin
f09c8393cb show dir selection dialog both with and without new dir button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 22:51:07 +00:00
Chris Elliott
922c7dcb6f borland 5.5 on XP dislikes -WE line and dies; earlier systems ignore error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 21:08:22 +00:00
Vadim Zeitlin
ce9462d21d implemented wxFileSelectorEx() (this fixes docview behaviour when multiple selections are specified in doc template)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 21:04:40 +00:00
Vadim Zeitlin
93fac60414 don't print 2 empty commands after building the program under non-Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 20:47:19 +00:00
Chris Elliott
11a1face0e fix bcc bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 19:54:11 +00:00
Gilles Depeyrot
c921fd5994 Only call use uppercase letter if control, alt, or shift is held down,
otherwise lower case accelerators won't work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 13:45:49 +00:00
Vadim Zeitlin
70687b638d silently ignore any X-fields in mime.types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 23:09:35 +00:00
Vadim Zeitlin
e69a1ea87c compilation fix for HP-UX CC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 22:56:49 +00:00
Robert Roebling
e3cff1fbb7 Uncommented warning that causes crashes while
reading .mime.types.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 21:56:09 +00:00
Stefan Csomor
7f3c339c0d using SelectWindow for Raise Implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 15:52:24 +00:00
Stefan Csomor
597a3d06bf added AppleEvent Handler, somehow the standard event handler does not take care of all of them..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 15:50:09 +00:00
Robert Roebling
f77cf4e68a Typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 14:55:28 +00:00
Robert Roebling
464f1a1da6 Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 14:45:38 +00:00
Robert Roebling
adfb70c30f Removed unnecessary SET_STYLE.. macros.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 10:31:54 +00:00
Robert Roebling
288059b2b9 Corrected GTK2 creation of default font.
Removed ugly SET_STYLE_FONT code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 10:31:05 +00:00
Robert Roebling
a148cfb644 Printing update for Pango (GTK2 and X11-Unicode).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 23:40:05 +00:00
Václav Slavík
6b5cdfed73 don't indent text body
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 23:10:23 +00:00
Václav Slavík
ce6cea6808 restored #ifndef wxUSE_UNICODE accidentaly removed by my previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 19:49:42 +00:00
Robin Dunn
68c124a168 1. Added m_count and maintain its value in InsertItem, RemoveItem
etc. and return it from GetItemCount to save so many calls to
   ListView_GetItemCount.

2. If EVT_LIST_DELETE_ALL_ITEMS was not handled then the
   post-processing code to prevent LVN_DELETEITEM messages was not
   getting executed.  Changed it so the post processing always
   happens.

3. It's possible with some versions of comctl32 that garbage values
   can be passed in nmLV->lParam so don't try to get the internal item
   data pointer from it.  This should close bug# 659939

4. Added FreeAllInternalData from DeleteAllItems, (part of patch
   #672065) and also guard against processing LVN_CHANG* messages
   while freeing the internal data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 01:53:28 +00:00
Robin Dunn
6edf791ccb Revert last change so the right log message gets put on the file. (I
did the last check in just a wee bit too fast...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 01:51:04 +00:00
Robin Dunn
cca784632f Fix for export warning when compiling a DLL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-30 01:48:11 +00:00
Václav Slavík
e74563e412 added MSLU reference to wxUSE_UNICODE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 23:29:11 +00:00
Stefan Csomor
c5c9378c98 carbon event support completed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:23:01 +00:00
Stefan Csomor
ac9b5f9889 bug fix & carbon support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:21:58 +00:00
Stefan Csomor
233d603a09 string conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:07:24 +00:00
Stefan Csomor
2726cac595 carbon modal state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:06:54 +00:00
Stefan Csomor
5fa00d2425 bugfix : text background when using appearance text drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:06:08 +00:00
Stefan Csomor
4abac0c027 getting rid of wxBuffer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:04:37 +00:00
Stefan Csomor
45a0fd3723 adaptions for cleaned up string conversions & carbon events support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:04:04 +00:00
Stefan Csomor
95fd868c8f adaptions for cleaned up string conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:03:43 +00:00
Stefan Csomor
4c200e8d87 moving string conversions at one place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:02:14 +00:00
Stefan Csomor
f352dd54f0 removing path corrections for wxMac, we now want a correct platform string for unzOpen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 15:00:57 +00:00
Stefan Csomor
cd28bcaded moving all string conversions to private.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 14:59:28 +00:00
Stefan Csomor
88522554f8 moving all string conversions here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 14:58:01 +00:00
Stefan Csomor
0f5cc041d2 additional mac alias types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 14:56:17 +00:00
Stefan Csomor
4c2300c6a1 getting rid of wxBuffer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 14:55:21 +00:00
Jouk Jansen
701d8d7606 Committing in .
wxIcon creation changed -> MOTIF code had to be changed likewise the GTK
version.

 Modified Files:
 	wxWindows/src/common/resource.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 11:54:57 +00:00
Jouk Jansen
e004299a08 Committing in .
OpenVMS updates

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/motif/toplevel.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-29 11:52:47 +00:00
David Webster
378ad9574d listctrl update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 23:21:51 +00:00
Gilles Depeyrot
57fbe23f68 added definition of TARGET_CARBON when compiling with non generated setup.h
using Project Builder


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 22:26:30 +00:00
Gilles Depeyrot
82d4311313 moved definition of TARGET_CARBON to generated setup.h when compiling with
Apple Developer Tools


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 22:23:02 +00:00
Mattia Barbon
1e4786bb37 Regenerate makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 21:02:32 +00:00
Stefan Csomor
a3195b73a6 only handling inContent CarbonEvents if we are the active window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 16:45:31 +00:00
Stefan Csomor
851b3a889f CarbonEvents Added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 12:29:55 +00:00
Stefan Csomor
7c15086ca4 Review, Carbon Events support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 12:27:43 +00:00
Stefan Csomor
01fbf5d755 static box parent warning added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 12:26:43 +00:00
Stefan Csomor
581bebd192 no new install of event handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:30:54 +00:00
Stefan Csomor
15b41e900b cleanup, Carbon Events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:27:05 +00:00
Stefan Csomor
64820d33a1 clipping before redraw in the setbackground callback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:25:53 +00:00
Stefan Csomor
1dd85cc3d6 closer clipping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:24:38 +00:00
Stefan Csomor
0150a5b8b9 mini-patch for better layout under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:23:43 +00:00
Stefan Csomor
2e97b58c63 new menu code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:22:48 +00:00
Stefan Csomor
408ad8789c not neede anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 08:22:18 +00:00
Stefan Csomor
9145b0c6ce corrected Yes/No
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 07:55:37 +00:00
Stefan Csomor
bf918b97ed wxMenu Review, added Carbon Events and full OSX Support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 07:55:08 +00:00
Stefan Csomor
cbf8aca6d4 Carbon Events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 07:01:23 +00:00
Stefan Csomor
b89f23763c formatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 07:00:57 +00:00
Stefan Csomor
f3fb0a0719 wxMenu Review, added Carbon Events and full OSX Support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 06:54:36 +00:00
Stefan Csomor
339e0cf110 not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 06:53:15 +00:00
Stefan Csomor
6357cb9d09 added WXEVENTHANDLERREF for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 06:49:45 +00:00
Gilles Depeyrot
36825681b5 improved Mac resource creation step in order to allow samples to provide
specific Rez options (used in docview sample)
added separate Mac Finder flag modification step (using SetFile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 22:18:18 +00:00
Mattia Barbon
ab82ab0704 Remove some redefinition warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 21:41:53 +00:00
Julian Smart
6394c5966c Corrected printing docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 11:27:43 +00:00
Ron Lee
e8d19ddd5f Add SetScrollbars patch, assuming this one really fixes things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 09:09:19 +00:00
Ron Lee
150c8d89c7 Fixed bug in FlexGridSizer mods that prevented them from ever shrinking.
Reverted the earlier SetScrollbars patch and fixed a bug in GetVirtualSize
that was hopefully the real cause of all the preceding woe.

Added a comment and a kludge for a most unusual bug manifesting in the
scrollsub sample.  If it is resized quickly size events appear to get lost
and the scrollbar is set incorrectly.  Adding an extra call to
AdjustScrollbars masks the problem, though its clearly superfluous since
the FitInside above already calls it.  This seems to be a brand new problem
(on both Gtk and msw) as of some time prior to this patch and it should be
looked into further.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 09:02:58 +00:00
Vadim Zeitlin
dd91da4ed1 added Add/InsertTool() (patch 672032)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 01:13:35 +00:00
Vadim Zeitlin
fccacb2a9d the string 'Goto...' should be translated (patch 674569)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 01:04:57 +00:00
Vadim Zeitlin
2b61c41b71 updated sample evrsion from Greg Chicares
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 00:19:36 +00:00
Vadim Zeitlin
cab8f76eb8 fixed a crash in socket server test and added quit command to the server
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 00:18:44 +00:00
Václav Slavík
eaf498dffe fixed someone's typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:20:42 +00:00
Václav Slavík
903972f999 added wxHtmlWindow::LoadFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:20:00 +00:00
Václav Slavík
7cb9cf8992 1. added wxHtmlWindow::LoadFile
2. interpret LoadPage's argument as filename if it fails as URL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:19:46 +00:00
Václav Slavík
2f5b93fb9f added wxSplitterWindow to XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:19:04 +00:00
Robert Roebling
e4da1035e4 Now scaling doesn't scale GetTextExtent() anymore. This
make print previewing look fine for now. Next is actually
   printing what you preview :-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 21:04:10 +00:00
Václav Slavík
25d599ae91 fixed loading of GNOME2 mime icons (still not working as desired)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 20:56:31 +00:00
Václav Slavík
805f26b316 use all MIME data sources on Unix, not only mailcap/mime.types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 20:54:57 +00:00
Julian Smart
eed1be652a Fixed problem with kill focus event getting sent to control
that is getting the focus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 19:04:10 +00:00
Václav Slavík
f2dec5b10d compilation fixes (bug #672413)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 16:16:13 +00:00
Václav Slavík
5eac771d09 eliminate __WIN32__ only code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 16:15:08 +00:00
Vadim Zeitlin
f357c0d42c moved OLE files group under MSW files -- this is more logical
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 14:11:39 +00:00
Vadim Zeitlin
4519ac17a7 corrected the paths for the OLE files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 14:09:52 +00:00
Vadim Zeitlin
9dd96c0f6d compilation fix after wxSizer::Remove() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 14:03:29 +00:00
Robert Roebling
77efa6a8fc Minor changes to printing sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:41:01 +00:00
Robert Roebling
cfcc393212 Font work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:40:45 +00:00
Robert Roebling
138618acb9 Small speed up to fonts and support for scaling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:39:51 +00:00
Václav Slavík
e046e5f1e7 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:36:48 +00:00
Václav Slavík
778262c49b don't forget to backport Robert's GetInternalFont change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:36:28 +00:00
Gilles Depeyrot
99c2d4f20c added CarbonFrameworkLib to CodeWarrior 5 projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 11:24:49 +00:00
Vadim Zeitlin
1558859090 added iosfwrap.h (wrapper for <iosfwd>)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 00:35:19 +00:00
Vadim Zeitlin
65f19af139 added iosfwrap.h (wrapper for <iosfwd>)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 00:12:12 +00:00
Vadim Zeitlin
5d76f46282 added support for non flexible (in one direction only) flexible sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 00:04:24 +00:00
Vadim Zeitlin
2abb9d2f17 added wxArray::SetCount()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 23:47:33 +00:00
Vadim Zeitlin
0bbe4e299c documented wxT(), _T(), _()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 22:49:41 +00:00
Mattia Barbon
5709329c88 Compilation fix for changed wxSizer::Remove() signature.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 16:44:43 +00:00
Vadim Zeitlin
c781807d89 removed wxICON_IS_BITMAP, it is now always (implicitly) set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 13:06:00 +00:00
Vadim Zeitlin
e0d8fb4572 restored int (instea of size_t) in Remove() and Detach(); TRUE/FALSE -> true/false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 12:50:32 +00:00
Vadim Zeitlin
d162a7ee7d removed warnings about using the deprecated functions and replaced untyped
wxLists with the type safe equivalents (patch 668204 from Dimitri)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 12:28:51 +00:00
Vadim Zeitlin
5e3841bf80 fixed typo in library name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 12:13:36 +00:00
Vadim Zeitlin
8e41796c6c File/DirExists() are const now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 12:01:57 +00:00
Gilles Depeyrot
df861444a1 added CarbonFrameworkLib to CodeWarrior 5 projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 11:52:00 +00:00
Gilles Depeyrot
2c74cde0c6 added CarbonFrameworkLib to CodeWarrior 5 projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 11:08:08 +00:00
Ron Lee
04cd30dea2 Update wxList operators, TRUE, FALSE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:52:21 +00:00
Ron Lee
cdd64cc06c Upated list operators, TRUE, FALSE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:44:53 +00:00
Ron Lee
8f91dda1b4 Don't use bitmap by default.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:38:01 +00:00
Ron Lee
4f8090e092 Update list operators, s/TRUE/true/ etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:35:21 +00:00
Ron Lee
a0f3867a6a Don't default to using bitmap.
Replaced old list operators.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:26:33 +00:00
Ron Lee
8ddf18dd0d Updates to packaging from the 2.4.0.2 release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:20:13 +00:00
Ron Lee
c155898a21 Added missing quantize.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:09:06 +00:00
Vadim Zeitlin
7b4c314952 moved GetRed() in its correct place in alphabetical order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 01:09:42 +00:00
Vadim Zeitlin
01802c507c typo fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 01:07:20 +00:00
David Webster
4fd899b671 Support for new native OS/2 tree control with drag-and-drop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 22:31:41 +00:00
David Webster
c0ae383ac0 Support for new native OS/2 tree control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 22:26:04 +00:00
Julian Smart
5d9ea849d8 Removed spurious character
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 13:51:56 +00:00
Julian Smart
85b7bb3557 Applied patch [ 673055 ] Text rendering in wxGTK 2.4.0 and GTK2 fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 12:36:04 +00:00
Julian Smart
82e5f91bff Applied patch [ 668155 ] Refresh problem when msgbox is shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 12:29:06 +00:00
Julian Smart
c8c5c7f62e Applied wxFileHistory menu separator patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 12:20:51 +00:00
Julian Smart
e910c00040 Only use patch from Otto Wyss on universal, for now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 12:12:06 +00:00
Julian Smart
95bcc40c74 Applied patch [ 666379 ] CalCtrl doesn't use best sizes for the year combobox
In the calender the size of the combobox for the year
is just defined by a margin from the month combobox to
the left border. While in wxUniv the year control can't
show all 4 digits, in wxMsw it show almost twice as
much.Instead the year should use it's best size and be
left aligned to the calendar. Just in case the month in
any language is longer than it has space in the
calendar it is shortend.This way the year always can
show the 4 digits.

This patch relies on the fact that a combobox has a
good best size implementation. This is not the case
with wxMSW but I don't know why. In wxUniv there is
another patch [634896].


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 12:00:28 +00:00
Julian Smart
53b982112d Applied patch [ 665806 ] Better slider test in widget sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 11:55:29 +00:00
Julian Smart
5cdff2990b Applied patch [ 665088 ] Setup options cleanup (wxUniv)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 11:53:06 +00:00
Julian Smart
6766e5d136 Applied patch [ 621451 ] Fixed version of wxSlider class
Otto Wyss

This patch corrects several bugs in the wxSlider class
for the wxUniversal/MSW port. It affects the files
"slider.h", "slider.cpp", "win32.cpp" and "gtk.cpp"
(and others). The slider should now work as expected. A simple test
program can be downloaded from

"http://dpartialmirror.sourceforge.net/Test/".


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 11:23:52 +00:00
Vadim Zeitlin
350777b68f added and documented wxDirTraverser::OnOpenError
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 00:32:17 +00:00
Vadim Zeitlin
d1be6261e3 mention Watcom makefile for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 00:31:15 +00:00
Vadim Zeitlin
2f0c19d0a8 minor changes to wxDir test code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-24 00:07:42 +00:00
Mattia Barbon
182c0f4675 Removed backported changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-23 20:38:55 +00:00
Mattia Barbon
9f667cbcb2 Clearly indicate that DialogEd requires wxr to compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-23 20:30:40 +00:00
Václav Slavík
a663cce7f9 removed wxEncodingConverter from docs where wxMBConv should be mentioned instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-23 19:49:53 +00:00
David Webster
c4f4cf895c Try this again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-23 14:22:05 +00:00
Vadim Zeitlin
06e8e72d84 updated for the latest makewat.env changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 23:03:35 +00:00
Vadim Zeitlin
ae7583b4bf yet more doc fixes to backport
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 21:49:06 +00:00
Vadim Zeitlin
3492e7c804 fixed Update() signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 21:46:45 +00:00
Vadim Zeitlin
efa7066d36 use correctly defined LIBPAGESIZE instead of 512 for the page size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 21:02:34 +00:00
Vadim Zeitlin
8bbbae215c made wxBitmapRefData private (actually, this also fixes some bug so it's not absolutely gratitious, but I already closed the bug not knowing that my cvs checkin was going to timeout and die and don't remember any more what it was...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:43:02 +00:00
Vadim Zeitlin
33a7c3dd0b linking fix for wxUSE_WCHAR_T=0: always provide wxStrtok() unless HAVE_STRTOK_R is defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:32:43 +00:00
Vadim Zeitlin
545d1e6050 update Watcom section; minor additions to the other ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:31:04 +00:00
Vadim Zeitlin
a7b4607f4a compilation fixes for OpenWatcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:19:23 +00:00
Vadim Zeitlin
c9b6238d67 don't always rename the files before compiling with Watcom, this is not needed any longer with OpenWatcom (but still keep the possibility to enable this file renaming for older versions)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:15:39 +00:00
Vadim Zeitlin
a0499e2f21 new (for wxBase) or updated and (hopefully() improved Watcom makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:13:52 +00:00
Vadim Zeitlin
23d2edff35 fixed an unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:10:49 +00:00
Vadim Zeitlin
7d2304132b no changes (modeline tweaked)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 17:04:12 +00:00
Vadim Zeitlin
23efb556d9 corrected and expanded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-22 16:04:22 +00:00
David Webster
b45bca403a New native OS/2 list control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 23:46:27 +00:00
David Webster
9794cae1b3 New native OS/2 list control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 23:35:16 +00:00
David Webster
c220541de4 New native OS/2 list control support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 23:34:02 +00:00
Václav Slavík
730dfeb496 patch 672127: Adds required check for wxUSE_WXHTML_HELP to chkconf.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 23:28:07 +00:00
Vadim Zeitlin
9e300531e5 compilation fix for the last check in (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 19:57:34 +00:00
Gilles Depeyrot
f823cacbda corrected wxList::Node declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 19:44:23 +00:00
Vadim Zeitlin
7eb833e673 attempt to fix crash in DeleteAllItems()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 18:56:31 +00:00
Julian Smart
e7b6ce1cf9 Updated wxBitmap overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-21 08:58:30 +00:00
Václav Slavík
63a76696df fixed MGL libraries detection code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-20 23:23:57 +00:00
Mattia Barbon
c3f64df223 Fixed a typo in makefile.vc, updated version numbers in templates
(.DSPs were already up to date).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-20 21:57:10 +00:00
David Webster
dc259b7926 TRUE not true, FALSE not false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-20 21:22:43 +00:00
Václav Slavík
cba5a276e4 added wxART_MISSING_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-20 00:31:28 +00:00
Václav Slavík
e879e020e7 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 23:32:04 +00:00
Chris Elliott
18f7d0e1db commit missing .rc file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 21:35:06 +00:00
Václav Slavík
82e94f591f updated for new/better way of declaring wxART_xxx constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 18:10:47 +00:00
Václav Slavík
214bdb93da use wxART_BROKEN_IMAGE in wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 18:10:09 +00:00
Václav Slavík
fd397f9966 use wxART_MISSING_IMAGE in wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 18:08:44 +00:00
Vadim Zeitlin
5ff72dc423 added --with-wxdir=DIR option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 12:04:07 +00:00
Mattia Barbon
db8b7c5061 More changes to be backported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 10:18:50 +00:00
Mattia Barbon
24dc054793 Patch [669503] Patch to CW7 wxMSW project file
from Igor Mikolic-Torreira


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 10:15:45 +00:00
Mattia Barbon
a203834e6b Patch [669508] Define Win32 symbols for CW in platform.h
from Igor Mikolic-Torreira


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 10:10:54 +00:00
Mattia Barbon
cceb71da44 Patch [665886]: Fix smapi.cpp to support new for loop scoping.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 10:01:52 +00:00
Mattia Barbon
1bc822dfb5 Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate
changes to wxIcon.
  Fix deprecation warnings and use %p to format WXWidget in debug output
(fixes the 4 non-deprecation warnings).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 09:52:29 +00:00
Ron Lee
2fda214570 We surely don't need two debugging sections,
called one Logging features instead.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 08:20:38 +00:00
Václav Slavík
192ce0bec9 better XRC handler for wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 23:56:36 +00:00
Václav Slavík
432be5aade reformatted for 79 chars width and added wxToolBar docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 23:50:36 +00:00
Václav Slavík
c37ffc1fef updated wxToolBar handler to support new wxToolBar features
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 23:49:28 +00:00
Mattia Barbon
fd304d989b Fix some wxMotif build warnings about deprecated methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 13:01:17 +00:00
Vadim Zeitlin
52c71b808f experimental --inplace flag implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 03:09:08 +00:00
Vadim Zeitlin
8d90d2f25f attempts to fix vsnprintf() detection under HP-UX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 02:40:03 +00:00
Vadim Zeitlin
ec0d6da38d attempts to fix vsnprintf() detection under HP-UX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 02:33:13 +00:00
Vadim Zeitlin
677eb52d3f no real changes, just cleanup after merging in Vaclav's changes which were the same as I had done locally (but forgot to commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 01:53:08 +00:00
Vadim Zeitlin
1b80ba97f3 fixed resource leak in MemoryHDC (closes bug 670016)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 01:51:05 +00:00
Václav Slavík
cc81d32f2b TRUE/FALSE -> true/false in documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:16:34 +00:00
Václav Slavík
4aa3178674 why the heck should something that reacts on wxID_CLOSE be called OnQuit?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:03:59 +00:00
Václav Slavík
e7266247d5 added wxFileName::MakeRelative test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:03:30 +00:00
Václav Slavík
65d8ef1e73 added --disable-compat24, 22 compatibility is off by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:02:32 +00:00
Václav Slavík
b4a89d27eb wxLocale::Init bugfix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:01:41 +00:00
Václav Slavík
56acdfef2f use wxFileName::MakeAbsolute istead of Normalize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:01:29 +00:00
Václav Slavík
0894707e7c added wxFileName::MakeAbsolute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:01:18 +00:00
Václav Slavík
7f891ef107 no need to have this VMS-only; removed TABs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:00:22 +00:00
Robin Dunn
c9c50e2395 wxMac (and maybe others?) get PAGEUP/PAGEDOWN instead of NEXT/PRIOR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 22:52:50 +00:00
Vadim Zeitlin
4522bb3ecf use wxDynamicLibrary instead of wxPluginManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 20:52:39 +00:00
Mattia Barbon
d66dcb6022 Under Cygwin, in platform.h default to wxMSW unless otherwise specified.
Do not #define __WIN95__, __WINDOWS__, __WXMSW__ on the command line for
Cygwin/MinGW (when build with makefiles), since platform.h already does
that for us.
  Always check for __WIN32__, not for WIN32 or _WIN32 (just for
consistency).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 20:01:20 +00:00
Václav Slavík
b78a78f779 (probably) fixed wxLocale::Init with Borland C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 19:58:53 +00:00
Stefan Neis
e107213f89 Fixed typo in test for WX_STATVFS_T
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 14:02:25 +00:00
Vadim Zeitlin
b448f30e9c Borland apparently uses for int64 in printf(), not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 13:27:20 +00:00
Vadim Zeitlin
525582584c check for NULL szLocale in Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 12:39:00 +00:00
Vadim Zeitlin
649a48a216 tried to make wxCloseEvent docs more clear too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 11:58:40 +00:00
Vadim Zeitlin
448025b0dc documented UngetWriteBuf overload
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 11:04:58 +00:00
Stefan Csomor
f81127c568 added horizontal scrollbars to listboxes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 10:42:33 +00:00
Stefan Csomor
b9e3bdc539 make sure wxMac fonts are never AntiAliased (measuring problems would occur, because char-widths become fractional then)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 10:29:59 +00:00
Stefan Csomor
9f67b77690 include needed for CFString conversion routines (param default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 10:27:48 +00:00
Stefan Csomor
ac17f9b104 Get/SetNoAntiAliasing implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 10:24:59 +00:00
Vadim Zeitlin
24174c30e0 tried to make Close() docs more clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-17 01:32:38 +00:00
Ron Lee
dc18c8f1b2 update libpng-dev deps.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 23:55:51 +00:00
Vadim Zeitlin
974d9c98f0 added links to the event docs from the default event processing section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 22:50:30 +00:00
Mattia Barbon
0ec6fd04eb Remove calls to a couple of deprecated methods, fix wxMotif build with
GCC 3.2, remove deprecated (and unused) fstream.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 20:44:47 +00:00
Mattia Barbon
46675b4610 Implement vertical toolbar under Motif.
Notify parent frame when toolbar is moved/resized/added/deleted so that
frame childs can be correctly repositioned.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 20:41:07 +00:00
Julian Smart
b05206c98b Added About menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 15:24:13 +00:00
Julian Smart
476d311420 Added Mac icons to helpview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 15:21:19 +00:00
Julian Smart
2c4c6c0ad0 Added CW project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 14:31:41 +00:00
Stefan Csomor
c718e0b31c added missing includes for wxMac specific additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 14:19:14 +00:00
Stefan Csomor
d3d3426196 adapted wxSizer::Remove type to new header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 14:11:24 +00:00
Vadim Zeitlin
2f82c92009 forgot to include wxControlWithItem docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 13:21:38 +00:00
Vadim Zeitlin
f21fcc9d2e the find dialog is created hidden, as all the other top level windows, but the docs said otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 13:03:50 +00:00
Vadim Zeitlin
eff41ee7f5 fixed detection of whether we're invoked from the top level configure or not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 12:58:02 +00:00
Julian Smart
d9b21c9f47 ReDOS-ified project files
Added menubar for wxHTML help viewer on Mac
Added some Mac-specific code for HelpView


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 12:26:09 +00:00
Stefan Csomor
5ab6aab880 preferences menu implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 06:54:47 +00:00
Stefan Csomor
ce72eadb4d renaming because of conflicts with base Create::
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 06:53:32 +00:00
Stefan Csomor
22ab1509cd xml projects for CW 8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 06:50:42 +00:00
Stefan Csomor
1b6b675be3 additions for __MWERKS__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 06:47:22 +00:00
Stefan Csomor
513c3efc49 conversion scripts for CW 8 Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 06:44:49 +00:00
Václav Slavík
4e0862c4fd XRC fixes can be backported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 23:22:13 +00:00
Václav Slavík
e5db16098c fix object_ref handling in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 23:14:27 +00:00
Václav Slavík
317a0d7361 1. made XRC immune against changing CWD
2. fixed object_ref handling


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 23:14:07 +00:00
Ron Lee
dc5e3b9ec5 gah. escape $ in the here block.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 22:50:23 +00:00
Ron Lee
82a649b67c reverted the --inplace addition and instead documented the use of
--prefix and --exec-prefix to do the same thing.  I can't think of
any way to do this right now with one flag without making some
assumption about the users working habits.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 22:44:38 +00:00
Vadim Zeitlin
1fd16ce13c added checks to prevent running sub configure scripts directly (they can only
be executed by the top level configure)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 22:04:32 +00:00
Vadim Zeitlin
89e6bf6d7a updated configure to match configure.in changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 21:30:05 +00:00
Vadim Zeitlin
134ecc85d0 added WXWIN_COMPATIBILITY_2_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 21:15:00 +00:00
Julian Smart
d118863525 Applied David's fix for not autoconf-ing on RHL8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 16:12:12 +00:00
Vadim Zeitlin
cdc1d13baa Maximize(FALSE) change can be backported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 14:59:28 +00:00
Vadim Zeitlin
a0be434e78 fixed calling Maximize(FALSE) before the window is shown (bug 667665)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 14:58:17 +00:00
Vadim Zeitlin
a3bc6643b7 make uninstall should remove wxwin.m4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 14:50:36 +00:00
Vadim Zeitlin
8da8907446 corrected Get/SetFrame() parameter/return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 14:45:08 +00:00
Vadim Zeitlin
9b67a3fd2e removed OnXXX() methods, added new default event handling section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 13:27:15 +00:00
Julian Smart
732b838637 Patch for Winlib: struct stat is defined in sys/stat.h, which is not
pulled in by unistd.h on some system.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 08:17:25 +00:00
Vadim Zeitlin
37a0271532 update wxStaticText check in revisions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 00:55:36 +00:00
Vadim Zeitlin
b826684e26 fix for the previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 00:54:46 +00:00
Vadim Zeitlin
747798efb8 some mor minor bug fixes which can be backported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 23:48:19 +00:00
Vadim Zeitlin
6a629e51df fixed wxStaticText best size calculation (closes bug 667324)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 23:47:12 +00:00
Vadim Zeitlin
5553c7cfe0 Start() should resume the stopwatch if it is suspended
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 22:22:27 +00:00
Julian Smart
a006e78bd3 Fixed refresh bug on early versions of MacOS X by
refreshing whole window on (de)activation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 21:10:32 +00:00
Stefan Csomor
ab83849cea added TARGET_CARBON and __MACH__ info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 20:34:16 +00:00
Gilles Depeyrot
0211e0d557 clarified some Mac OS related preprocessor defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 20:15:44 +00:00
Vadim Zeitlin
0b481c72b6 compilation fix for wxUSE_CONSTRAINTS==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 19:40:55 +00:00
Mattia Barbon
0cd0d9a5ae #define HAVE_W32API_H for Cygwin/GCC 3.x, too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 18:29:10 +00:00
Julian Smart
2e38557f30 Applied patch [ 667563 ] Wine: compile fix for using glibc/msvcrt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 09:59:31 +00:00
Vadim Zeitlin
333b7dac15 fixed incorrect cast in wxRegKey:GetName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 09:02:38 +00:00
Jouk Jansen
5a2db5f1df Committing in .
Updates for OpenVMS support

 Modified Files:
 	wxWindows/src/motif/descrip.mms
 	wxWindows/src/unix/utilsx11.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 07:22:31 +00:00
Gilles Depeyrot
eb22f2a6dc updated source to not use deprecated wxList methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-14 07:01:22 +00:00
Vadim Zeitlin
8baeca5b24 mention Solaris 7 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 23:16:18 +00:00
Vadim Zeitlin
85da04e95b use WX_STATVFS_T instead of trying to guess statvfs() argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 21:55:24 +00:00
Vadim Zeitlin
54ab82b3f9 added configure test for WX_STATVFS_T
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 21:54:29 +00:00
Ron Lee
9cbee2ceee Improved const correctness.
Clear wxWindow containing sizer on Remove( index ).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 19:31:37 +00:00
Stefan Csomor
6b57b49ae3 cursor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 19:19:35 +00:00
Stefan Csomor
c6a071d2d2 cursor functionality expanded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 19:17:53 +00:00
Stefan Csomor
8165e9b648 additional infos for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 19:07:08 +00:00
Ron Lee
b1d4dd7add Split this out from other changes to keep things sane..
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 05:17:41 +00:00
Václav Slavík
5797172366 added info about ShowFullScreen changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 23:51:52 +00:00
Vadim Zeitlin
64f590eaa1 DeleteAllItems() does send DELETE_ITEM events (closes bug 664281)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 23:34:29 +00:00
Vadim Zeitlin
a40c9444bb compilation fix for wxUSE_RICHEDIT == 0 (closes bug 662252)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 23:24:46 +00:00
Vadim Zeitlin
14347204d3 more docs about compiler constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:56:05 +00:00
Vadim Zeitlin
a30c309aa8 added wxCHECK_GCC/W32API_VERSION
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:55:05 +00:00
Vadim Zeitlin
652703802c OpenWatcom fixes may be backported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:45:49 +00:00
Vadim Zeitlin
4c87eb44c2 OpenWatcom compilation fixes (patch 665959)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:40:48 +00:00
Vadim Zeitlin
c5c843e007 compilation fix for wxUniv (patch 664699)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:31:16 +00:00
Vadim Zeitlin
b2697d4205 unTABbed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:30:51 +00:00
Vadim Zeitlin
29f82345df set wxUSE_WIZARD to 1 by default now that it works (patch 663321)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:28:26 +00:00
Vadim Zeitlin
890741df89 removed unneeded (and causing link errors) wxArrayPages from wizard code (patch 663321)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:26:31 +00:00
Vadim Zeitlin
e30285abc6 compilation fixes for non default wxUSE_XXX values (patch 662781)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:20:46 +00:00
Vadim Zeitlin
12c44eb56d corrected m_commandString type to wxString (patch 661648)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 22:06:31 +00:00
Vadim Zeitlin
7f04165e6f don't call stat() *and* lstat() (as if the file dialog wasn't already slow enough...); minor code cleanup (removed a few #ifdef's, TABs and other crap)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 14:24:32 +00:00
Mattia Barbon
7b507740a8 Remove unneeded dependencies.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 14:09:30 +00:00
Mattia Barbon
4995ca8037 Remove use of deprecated KeyCode accessor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-12 13:52:12 +00:00
Mattia Barbon
a43d5db22b Changes to be backported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 21:02:16 +00:00
Mattia Barbon
77e00fe9da Do not use deprecated functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 21:00:50 +00:00
Mattia Barbon
0fccfc51e6 Fix linking problems with MSVC 5.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 20:57:16 +00:00
Mattia Barbon
1c1572053a Fix PCH problems with some versions of CodeWarrior.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 20:55:27 +00:00
Mattia Barbon
a29ee70613 If -1 is used for width/height, use best size.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 15:03:42 +00:00
Mattia Barbon
07157c53d0 Use checkbox if togglebutton not available.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 15:00:26 +00:00
Mattia Barbon
a969055e89 Removed unused, unimplemented and undocumented wxBitmapCheckBox stub.
Minur cleanup in wxCheckBox::Create.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 14:42:38 +00:00
Mattia Barbon
a4e64fb55e Documented wxMotif filedialog limitations WRT wildcard syntax.
Modified filedialog to either extract the wildcard (if only one wildcard
is present) or assert (if more than one is present).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 14:36:25 +00:00
Stefan Csomor
992c81e203 using the new alerts under OSX - no string255 limits anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 11:57:25 +00:00
Stefan Csomor
3d963f8137 added conversion function to CFStringRefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 11:56:48 +00:00
Stefan Csomor
67e3d9d399 removed commented out snippets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 11:54:27 +00:00
Ron Lee
094e328c21 Changes resulting from the 2.4.0 release run.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 03:50:44 +00:00
Vadim Zeitlin
82c23bb595 removed TABs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:52:17 +00:00
Vadim Zeitlin
1ec5cbf3de removed wxLog::HasPendingMessages() (it can't be made to work correctly with wxLogChain); don't send the messages going to a log file to debug output under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:47:14 +00:00
Vadim Zeitlin
6dd16e4f26 removed style parameter from MSWCreate(), it is unneeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:27:17 +00:00
Vadim Zeitlin
29020b9048 use MSWCreateControl() instead of duplicating its code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:24:44 +00:00
Vadim Zeitlin
278c927dd9 removed style parameter from MSWCreateToolbar(), it is unneeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:23:49 +00:00
Vadim Zeitlin
eb199c515b removed CopyObject(), added copy ctor, corrected Dump()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 17:57:45 +00:00
Stefan Csomor
450a5bdd2d corrected type for text document (non standard save handler)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 17:57:05 +00:00
Stefan Csomor
738a6daa71 routing all apple events to the document manager instance if present, fully supporting launch by document double click, print by draging the document onto the printer icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 17:56:24 +00:00
Stefan Csomor
72625f830b switching to safe yields, because we got into loops when handling print document apple events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 17:52:54 +00:00
Vadim Zeitlin
106844da7d moved assert for parent window not being a static box to common code where it should catch more cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 17:19:57 +00:00
Stefan Csomor
b8afeb4321 added code for respecting the creator & types when saving files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 16:24:01 +00:00
Stefan Csomor
521a2cb154 makefile important for setting the correct creator of the app
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 16:18:08 +00:00
Stefan Csomor
eb017efed9 Register Default Creators under wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 16:13:40 +00:00
Stefan Csomor
1f6189acd0 added custom icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 16:12:32 +00:00
Stefan Csomor
e5940192b2 added custom icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 14:44:51 +00:00
Stefan Csomor
95d43281c3 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 14:44:06 +00:00
Julian Smart
d95861551a Corrected DLL version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 13:25:20 +00:00
Julian Smart
c4f48f14f1 Fixed corrupt files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 11:38:51 +00:00
Gilles Depeyrot
f346733b72 library installation base name and wxMac resources file base name
must be identical in order for the resource file to be found


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-09 20:57:31 +00:00
Gilles Depeyrot
23f0f906a2 removed execcmn from list of files to compile in release target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-09 06:44:57 +00:00
Václav Slavík
d1a9c82bd1 fixed ANSI/Unicode incompatibility of the cache (bug 663396)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 19:44:53 +00:00
Vadim Zeitlin
79f306d721 removed unneeded code which was inside #if 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 12:33:11 +00:00
Vadim Zeitlin
381adb7449 #undef LoadBitmap() too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 12:27:28 +00:00
Julian Smart
d11cd571c9 Fixed DSPs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 10:03:54 +00:00
Julian Smart
b1e635598d Applied cvsignore patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 10:01:33 +00:00
Julian Smart
0447ac8e64 Eliminated streams from scoredg.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 09:14:35 +00:00
Vadim Zeitlin
90b1d65f2f define true/false if the compiler doesn't have them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 22:29:59 +00:00
Mattia Barbon
038305d008 Left/right arrows were swapped.
Fix wxSP_WRAP handling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 21:41:28 +00:00
Julian Smart
a12df58228 Corrected some typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 21:19:13 +00:00
Julian Smart
b4da152ea3 Removed old __WXWINE__ support (obsoleted by new __WINE__ symbol)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 18:11:53 +00:00
Julian Smart
eaa6418668 Removed redundant <search.h> inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 16:49:22 +00:00
Mattia Barbon
3d8704720a Reverted accidental commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 15:17:40 +00:00
Mattia Barbon
1d390a62f9 Escape some _.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 15:15:41 +00:00
Václav Slavík
ddbfcced85 removed wxTLW cruft now that all ports have it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 15:03:56 +00:00
Julian Smart
5283098e13 Applied patch [ 662321 ] Port of wxWindows to Wine
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 13:49:08 +00:00
Ron Lee
12a3f2275c Deprecated wxSizer::Remove( wxWindow* ), s/Remove/Detach/ in most places.
Made wxSizer child list typesafe.  I've not added the wxList implicit
conversion kludge yet, let's see who complains first perhaps..

Deprecated wxSizer::{G,S}etOption in favour of {G,S}etProportion in line
with the parameter name change in the docs.

Added {G,S}etSpacer consistent with the accessors for windows/sizers.

Made all wxSizer index parameters size_t -- we support no sensible
interpretation for negative indexes in them.  Hopefully this will
cause no real problems, but code doing (eg. Remove( 0 )) will need
to change to use 0u to resolve the ambiguity with overloaded members.
This is probably a Good Thing though, ymmv.

s/FALSE/false/g ; s/TRUE/true/g ; s/wxASSERT/wxASSERT_MSG/g in sizer.{cpp,h}

Fixed (I hope) the brokenness in wxSizer::Show -- I have no code to test
this yet, so it's a blind change, but spacers should now be hidden correctly
instead of ignored, and it should be properly reversable over multiple
calls now too.

removed pointless private scoping around DECLARE_CLASS macros.

Replace 0's I added previously with NULL -- not like that will end the
email thread either..

Added Add( wxSizerItem * ) & co.  There are probably a couple of other
places we can usefully do something like this too.  Stopped short of
refactoring everything to raise some issues about sizer method recursion
on -dev.

Updated wxSizer docs some more, they are still incomplete but getting
better.

wrapped KeyCode in wxDEPRECATED, converted all (gtk build) instances
to GetKeyCode.  There may be a few left for other ports.

Fixed a couple of other random compile warnings along the way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 10:22:07 +00:00
Vadim Zeitlin
db50ec5a50 workaround for not appearing vertical scrollbar in wxTE_RICH2 controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 01:10:03 +00:00
Vadim Zeitlin
29343d0492 made the #error message less self-contradictory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 23:13:13 +00:00
Vadim Zeitlin
5e2411ab49 fixed the return type of LoadIcon()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 22:46:53 +00:00
Gilles Depeyrot
b447a1a7bc corrected release target which included some include files in the build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 21:35:07 +00:00
David Webster
2f60dbe2e9 OS/2 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 21:35:03 +00:00
David Webster
af30429f59 Remove ctl3d32.lib from make.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 21:33:35 +00:00
Julian Smart
9419379a37 Make it build in Unicode mode again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 21:12:15 +00:00
Mattia Barbon
0de6dfa701 Implemented wxToplevelWindowMotif. (forgot to commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 20:54:54 +00:00
Gilles Depeyrot
7563339557 corrected getting FSRef associated with the POSIX path in wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 19:38:18 +00:00
David Webster
0904e5e12a OS/2 patches missing from this version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 17:50:21 +00:00
David Webster
57ff8a875b no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 17:42:48 +00:00
Mattia Barbon
798a4529fe Implemented wxToplevelWindowMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 16:36:23 +00:00
Mattia Barbon
f58d1d9978 Aparently someone modified templates/filelist.txt without committing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 16:32:39 +00:00
Gilles Depeyrot
79597b2a4a updated Project Builder project for MoreFilesX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-06 07:21:05 +00:00
Robert Roebling
bbd006c0ce Removed usage of GetInternalFont() from GTK 2.0. This
also removes any usage of GdkFont. I left the actual
    deprecated method so that the change can be bckported
    without binary incompatible changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:59:44 +00:00
Robert Roebling
60d85ccb3d Removed usage of GetInternalFont.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:57:45 +00:00
Robert Roebling
cba9ef7f73 Minor fix related to wxMiniFrame drawing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:56:57 +00:00
Robert Roebling
ba71852396 Corrected wxMiniFrame for GTK2 and removed its
use of GetInternalFont(). Somehow, the close
    button doesn't appear.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:55:38 +00:00
Vadim Zeitlin
8b39c006d8 #undef LoadIcon() too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:11:24 +00:00
Stefan Csomor
f1872c18e6 region calculation for windows with borders too small
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 18:25:27 +00:00
Vadim Zeitlin
7379599933 compilation warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 16:20:32 +00:00
Václav Slavík
48594fd2cd added my patches to the list of things to backport to 2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 23:51:46 +00:00
Václav Slavík
8166ab4343 added more robust wxTLW::ShowFullScreen implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 23:34:34 +00:00
Julian Smart
ad0e4b6691 Use nicer (swiss) font for default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 20:53:28 +00:00
Julian Smart
db0834fab8 A script for helping make RPMs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 20:31:11 +00:00
Václav Slavík
7071c92817 gcc has __attribute__((deprecated)) since version 3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 13:29:36 +00:00
Julian Smart
17e7431567 Indicated in the source and on initialisation that this is an obsolete sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 11:04:39 +00:00
Mattia Barbon
e9e4acc519 Remove #ifdef __WXSTUBS__ from headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 09:22:53 +00:00
Robin Dunn
52d6f640e8 With the fix in gtk/font.cpp and switching to an wxplicit wxBOLD, it
should be okay to uncomment the code setting the label font.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 03:59:26 +00:00
Robin Dunn
cd9a673cd7 Ensure that the wxNativeFontInfo internal data is copied when the
wxFontRefData is.  This solves a wxGTK2 problem where the
PangoFontDescription pointer is copied by the default assignment
operator, in a binary compatible way .


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 03:51:13 +00:00
Vadim Zeitlin
6431e33a50 added polish translations from Janusz Piwowarski
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 01:54:14 +00:00
Ron Lee
55804c9363 more thinko tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 00:12:50 +00:00
Ron Lee
deefd67952 Recommend python-xml for xrced.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 23:47:08 +00:00
Ron Lee
0ecfbbea12 Incorporate changes from 2.4 release.
Bump standards version.
Update overrides for 2.5
Disable generation of gtk-univ package.
Update wx-config manpage.
Add wxPython-tools manpage(s).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 22:51:42 +00:00
Ron Lee
6c99908c51 The exact version it was included doesn't appear to be documented
anywhere, but __attribute__ ((deprecated)) is empirically not
supported by gcc-2.95.4.  Best guess so far is 3.0 or 3.1 so I've
erred on the side of the former for now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 20:52:10 +00:00
Robin Dunn
f3030ba726 Disable putting selected text in the Primary Selection, since wxGTK is
currenlty clearing the Clipboard when you do this.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 19:03:01 +00:00
Julian Smart
df37f0c65c Added opengl32.lib glu32.lib to OpenGL samples VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 18:37:28 +00:00
Julian Smart
2188f34751 Added dialup to filelist.txt and wxUniv.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 18:31:43 +00:00
Julian Smart
d89e39fcdc Added missing wx/frame.h inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 15:24:56 +00:00
Julian Smart
12335fa6aa Clean up memory if have to exit early
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 14:59:07 +00:00
Julian Smart
c5f53eb8cb Added a note about 'make install'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 14:08:53 +00:00
Julian Smart
c3a6a2bc10 Only enable tooltips on WIN32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 13:40:43 +00:00
Julian Smart
c8f9a56b7c wxUSE_TOOLTIPs => 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 12:53:33 +00:00
Stefan Csomor
be0b002a3e made static box only a frame region in all calculations (otherwise the background would not be redrawn in all situations)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 12:29:16 +00:00
Julian Smart
d4e5272b3a Applied patch [ 652336 ] Add tooltip support to wxUniv on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 12:14:59 +00:00
Julian Smart
df4a528177 Added glcanvas.cpp, tooltip.cpp, taskbar.cpp, wave.cpp to wxUniv/MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 12:01:01 +00:00
Stefan Csomor
2ac013b1a5 recommit after mac binary lapsus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 09:59:32 +00:00
Vadim Zeitlin
478d4ab7cf IsStandard() shouldn't return TRUE for formats >= wxDF_PRIVATE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 01:04:16 +00:00
Vadim Zeitlin
3e6562c110 argh, erased one extra line accidentally in the last commit -- restored
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:59:09 +00:00
Vadim Zeitlin
59018c74fe wx(Individual)LayoutConstraints may be copied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:55:28 +00:00
Vadim Zeitlin
00e7a427a0 compilation fixes after applying DECLARE_NO_COPY_CLASS() patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:46:08 +00:00
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:38:11 +00:00
Vadim Zeitlin
0becd47010 support for using DIBs for wxBitmap implementation (patch 649866)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:28:56 +00:00
Vadim Zeitlin
f178ab7e82 use StretchBlt() if available (part of patch 649866)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:25:17 +00:00
Václav Slavík
c75274f93c added wxDEPRECATED
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 22:52:47 +00:00
Václav Slavík
b254d1fe03 mark wxImage's wxBitmap functions as deprecated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 22:49:50 +00:00
Vadim Zeitlin
802df2b744 documented wxDateSpan
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 22:10:21 +00:00
Vadim Zeitlin
93401be962 added operator==() and !=() for wxDateSpan
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 22:07:51 +00:00
Vadim Zeitlin
e1e1272f20 implemented support for column label alignment (closes 215870)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 21:29:21 +00:00
Vadim Zeitlin
9baf5184bd the file containing the list of things which can be backported to 2.4 branch later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 21:00:28 +00:00
Vadim Zeitlin
caa20b1e31 added test for wxLIST_FORMAT_CENTRE/RIGHT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 21:00:17 +00:00
Vadim Zeitlin
6770762dd3 set wxListItem mask automatically to the correct value when a SetXXX() method is called
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 20:59:40 +00:00
Vadim Zeitlin
df4ac4c7e9 fixed bug with wxTR_EDIT_LABELS not working with xwTR_MULTIPLE (bug 622089)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 20:21:41 +00:00
Vadim Zeitlin
d553ceb286 test InsertItems() trying to reproduce the bug 633150 -- but unsuccessfully
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 19:18:19 +00:00
Vadim Zeitlin
ea8e90b7ce show Univ prefix in wxWindows info dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 18:43:56 +00:00
Vadim Zeitlin
a562f4fbde removed a couple of obsolete functions from wxDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 18:39:32 +00:00
Stefan Csomor
47710b3b4f attempt to recommit , contained binary data for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 18:13:07 +00:00
Stefan Csomor
92629fa47b attempt to recommit , contained binary data for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 18:10:38 +00:00
Stefan Csomor
2beae4b5a5 easier angle conversion wx-mac , corrected elliptic arc which sometimes filled in the wrong direction, fixed rotated text under osx (OSX ignored hanging baseline attribute)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 16:30:53 +00:00
Stefan Csomor
f2d990adc1 corrected generation of all event members (client data) and implemented DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 09:37:52 +00:00
Vadim Zeitlin
047f39deb9 fixed wxMutexLocker ctor signature (patch 660549)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 01:00:17 +00:00
Vadim Zeitlin
0f66923e84 say that EVT_TEXT_ENTER requires wxTE_PROCESS_ENTER to be set (closes bug 659948)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 00:45:40 +00:00
Vadim Zeitlin
fa06b433fc fixed wxCaret::SetSize() (closes bug 659209)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 00:41:47 +00:00
Vadim Zeitlin
cd916794f0 made generic EmulateKeyPress() to work with Delete and BackSpace (closes bug 658409)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 00:07:13 +00:00
Vadim Zeitlin
fdd04d720f typo fix (closes bug 654197)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 23:39:07 +00:00
Vadim Zeitlin
e08bbf3708 added a test for check tbar buttons state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 23:36:08 +00:00
Vadim Zeitlin
30e0e2518f tried to fix compilation with Watcom 11 (should fix the bug 651492)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 23:18:44 +00:00
Vadim Zeitlin
9112af3fd1 fix for HAVE_EXPLICIT for VC++ 6.0 (closes bug 651314)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:58:53 +00:00
Robin Dunn
65ca8c0b79 Changed wxLOG_Max to be a smaller (but still large) value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:50:02 +00:00
Vadim Zeitlin
e2ca995fa3 don't send CHECKLISTBOX_TOGGLE event when Check() is called (closes bug 651140)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:41:10 +00:00
Vadim Zeitlin
a8dade3e27 added IsEmpty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:09:41 +00:00
Vadim Zeitlin
3dabb1e51b added check/uncheck/toggle tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:09:14 +00:00
Vadim Zeitlin
bed5584e2a added wxControlWithItems docs, updated the others to refer to it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 22:08:11 +00:00
Gilles Depeyrot
0c98a14e54 use MoreFilesX instead of MoreFiles when building with Apple Developer Tools
added wxWindows version compatibility information to configuration summary


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 17:59:01 +00:00
Gilles Depeyrot
ec341c7e1f use MoreFilesX instead of MoreFiles when building with Apple Developer Tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 17:55:21 +00:00
Gilles Depeyrot
2d4e4f802f use MoreFilesX instead of MoreFiles when building with Apple Developer Tools
improved wxGenericDirCtrl when building with Apple Developer Tools
improved wxDirData to correctly handle hidden directories


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 17:53:02 +00:00
Gilles Depeyrot
15126fa8c2 MoreFilesX 1.0.1: A collection of useful high-level File Manager routines which
use the HFS Plus APIs wherever possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 17:20:59 +00:00
Robin Dunn
edc738528a Added wxLog::Get/SetLogLevel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-01 05:16:07 +00:00
Robin Dunn
8eb70827f3 Fixed problem of FormatText causing both the formatted and unformatted
text to be displayed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 22:17:37 +00:00
Gilles Depeyrot
05159a2750 SourceForge patch #654210 to fix naming/numbering shared libs under OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 21:20:59 +00:00
Julian Smart
05ac7ac578 Corrected accidental pointer arithmetic in ClientToScreen and vice versa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 20:10:03 +00:00
Václav Slavík
fa2f5d3bc9 fixed encoding handling in ANSI mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 18:55:33 +00:00
Ron Lee
96fdbb60f1 Ok, so we don't need the extra bool at all, we can just zero the sizer
pointer in wxSizerItem.  :-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 15:26:47 +00:00
Ron Lee
00976fe56b Add wxSizer::Detach so we can detach child sizers without deletion.
Updated wxSizer docs for this and a couple of other missing/outdated
things.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 13:02:15 +00:00
Vadim Zeitlin
41f0b62a32 fixed buffer overrun when reading CCITT group 4 compressed TIFF files (patch 646603)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 01:09:16 +00:00
Vadim Zeitlin
4fa47e5643 compilation warning fixes (patch 651719)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 01:00:49 +00:00
Mattia Barbon
e13f128877 Allow building in unicode mode with just "make -f makefile.g95 UNICODE=1"
without requiring setup.h modifications.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 19:37:10 +00:00
Mattia Barbon
9a718b8623 Small updates:
corrected some URLS, used correct/current capitalisation for MinGW and
Cygwin, plus some minor clarifications.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 19:32:06 +00:00
Julian Smart
916095ba21 Tweaked the wording slightly for VC++ 5 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 18:46:16 +00:00
Ron Lee
a8853c78ed Oops, don't cut and paste between ports, and do test compile both states
of a macro guard...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 15:45:35 +00:00
Mattia Barbon
b9ecc16a80 LessTif 0.93 does not hang in wxWindow::ChangeFont as 0.87 did:
enable chainging window font again.
  Set/reset MappedWhenManaged flag when showing/hiding a window, otherwise,
since some common operations (moving, adding items to a listbox, ...) do
a Unmanage-Manage pair, calling Hide and then (for example) SetSize would
show the window again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 07:59:02 +00:00
Mattia Barbon
17fe68bd23 Small correction: add WINDOWSLDLIBS when linking an executable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 07:54:16 +00:00
Ron Lee
99006e446e Added wxTreeCtrl::GetItemParent to deprecate GetParent.
Moved GetParent into WX_COMPAT_2_2 and exposed base GetParent in
that case too.

Replaced all lib/sample uses of wxTC::GetParent with GetItemParent.

Updated docs to suit.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 07:48:21 +00:00
Vadim Zeitlin
01a4679360 fixed wxALL_FILES definition in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-29 01:38:49 +00:00
Julian Smart
0222a60b34 Use path separator, not "/"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 22:58:12 +00:00
Mattia Barbon
2dcb5b11f4 Allow using tmake from places other than the current directory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 20:49:49 +00:00
Mattia Barbon
f657dbe781 Allow building Win32 DLL with wxGlCanvas using MinGW + configure.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 20:46:30 +00:00
Julian Smart
52ee226853 Updated some scripts
Small corrections to wxScrolledWindow doc


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 18:42:23 +00:00
Julian Smart
f54b065ea7 Fixed compilation by removing stream inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-28 18:36:25 +00:00
Mattia Barbon
0a3451df8a Updated Svedish translation from Jonas Rydberg.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 22:24:23 +00:00
Mattia Barbon
3880dd5161 Fix Cygwin + makefile.g95 + wxUSE_PROLOGIO=0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 22:07:46 +00:00
Mattia Barbon
78e376b56f Applied patch [ 652491 ] Update makefiles for mingw
from Greg Chicares, with some small modifications.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 21:58:36 +00:00
Mattia Barbon
17ebae657e Use wxWcslen instead of wcslen.
Work around a compiler bug: with (at least) GCC 2.95.3-5 under Cygwin,
the destructor for the global s_fileInfo is called twice (!). This does
hot happen if a function returning a reference to a static variable is
used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 21:39:58 +00:00
Robin Dunn
91f580b235 Fix for potential divide by zero error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 21:16:16 +00:00
Mattia Barbon
762e199741 wxPerl notes for DocView.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 18:30:48 +00:00
Julian Smart
5f133dc1bb Applied patch [ 657501 ] SpinButton wraps 1 too much
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 15:21:34 +00:00
Julian Smart
16990160f6 Applied patch [ 658174 ] Adds wxT() and char->wxChar conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 15:15:29 +00:00
Julian Smart
22f2279860 Applied patch [ 658505 ] Updates documentation for wxTimeSpan
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 15:12:38 +00:00
Julian Smart
657c88188f Applied patch [ 657515 ] Widgets sample notebook out of range
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 15:02:48 +00:00
Julian Smart
317246dfcb Applied patch [ 658786 ] Removes unresolved symbols from strconv (wxUniv/MSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:59:35 +00:00
Julian Smart
f9eee2db81 Applied patch [ 657969 ] Removes #if wxUSE_VALIDATORS code
for wxOS2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:52:14 +00:00
Julian Smart
8251c0d6ac Added a necessary pixel to height if wxTB_NODIVIDER is specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:40:52 +00:00
Julian Smart
d07ce169a8 Fixed bug [ 657949 ] Segmentation fault in ~wxFileHistory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:25:59 +00:00
Julian Smart
0156594543 Improved SetScrollbars fix using client size and max of window and virtual
sizes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:17:55 +00:00
Václav Slavík
85452d7496 fixed XRCID() lookup of numeric control IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-26 23:36:34 +00:00
Robin Dunn
ba5da12f72 Use WXDLLEXPORT_DATA for wx*NameStr's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-26 19:16:49 +00:00
Václav Slavík
4249ec2c52 1) fixed compilation of wxBitmap, wxIcon toplevel nodes
(to be backported into 2.4.1)
2) fixed wxrc when using -o dirname/filename


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-25 15:23:44 +00:00
Mattia Barbon
99ab3e3f56 Use wxClientDataDictionary for client data.
Factored out common code into wxSizeKeeper.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-24 18:41:42 +00:00
Mattia Barbon
c13c9657a4 Use wxXmString instead of XmString.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-24 18:37:10 +00:00
Julian Smart
8a653baab6 Reverted cross-compile patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-24 09:51:45 +00:00
Julian Smart
d0604192a5 Don't pass zero width or height to SetVirtualSize or layout is
messed up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 23:42:13 +00:00
Vadim Zeitlin
4b4381cb84 minifram.cpp is a low level file under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 21:29:44 +00:00
Ron Lee
6d407f1953 Typo fix (as reported to Debian bts).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 21:20:54 +00:00
Julian Smart
8d1e36f7e3 Don't send explicit update event if single line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 13:18:28 +00:00
Julian Smart
c90c201ab3 Applied cross-compile patch from Stephen Crowley
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 13:00:17 +00:00
Julian Smart
441582ddd8 Added *.ani to image sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-23 11:17:28 +00:00
Mattia Barbon
aff23fcd97 Unicode compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-22 20:14:18 +00:00
Mattia Barbon
f37c24e078 Unicode compilation fixes.
wxpoem now compiles with default settings (making it compilable with
Unicode is a lost cause).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-22 19:57:17 +00:00
Julian Smart
a55e5190c7 FL event fix from Hans
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-22 12:17:57 +00:00
Julian Smart
45747ae371 Applied patch [ 657445 ] Contrib FL lib doesn't build with wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-22 11:03:31 +00:00
Vadim Zeitlin
b74cce40fd handle accel keys for owner drawn menu items (based on the patch 657105)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 15:01:21 +00:00
Vadim Zeitlin
46a5e01e86 use SS_CENTERIMAGE to prevent wxStaticBitmap from stretching its bitmap; also a face lift for control creation code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 14:35:18 +00:00
Vadim Zeitlin
168954a1d1 fixed memory leak (patch 655899)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 14:32:55 +00:00
Vadim Zeitlin
894c8f3ef2 fixed a typo in cygwin make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 13:41:02 +00:00
Václav Slavík
5dac8a3b0e fixed 2 encoding handling bugs in XRC/wxrcedit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 13:35:13 +00:00
Václav Slavík
437bd21582 WX_XMLRES_CURRENT_VERSION_STRING wasn't Unicode safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 00:21:23 +00:00
Václav Slavík
6267a331cb 1) added wxFrame support to wxrcedit
2) fixes to wxrcedit so that generated files are compatible with new XRC
(both in patch #648659)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-21 00:20:35 +00:00
Julian Smart
fc9a9b2ab2 Do -> Redo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-20 11:15:05 +00:00
Julian Smart
d863ed8333 Cleaned up SetMenuStrings, factoring out redo and undo label accessors at the same time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-20 10:15:06 +00:00
Vadim Zeitlin
f9becb8622 install the headers under wx/msw/gnuwin32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-20 00:23:16 +00:00
Vadim Zeitlin
98e19a5863 fixed SetSelection() (and hence SetInsertionPoint()) behaviour when using richedit 3.0 with wxTE_RICH2 style and the control doesn't have focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-20 00:18:35 +00:00
Julian Smart
c76b1a30fa Fixed a problem with borders being set wrong sometimes on wxMSW, XP, VC++ 7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 23:13:53 +00:00
Václav Slavík
5f265f87d9 we don't really have to use variable instead of constant...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 22:15:45 +00:00
Julian Smart
e39081afef Don't build IPC version of HelpView on Mac Classic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 20:02:27 +00:00
Julian Smart
0bc836492e Added missing fldef.h to makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 12:21:25 +00:00
Julian Smart
192a9bf10f Apply table border fix to all ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 10:24:05 +00:00
Mattia Barbon
643e16ac3b Fix wxSingleChoiceDialog under wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 09:56:03 +00:00
Julian Smart
76985f52b2 Fix border for wxGTK too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 09:54:47 +00:00
Ron Lee
8155b6405f Update packaging for 2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 09:16:10 +00:00
Julian Smart
d840aae3ae Reinstated the cell border fix (wxMSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 07:47:06 +00:00
Václav Slavík
94bc8b14d4 simpler fix for rendering bug fixed in previous revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 23:32:22 +00:00
Julian Smart
75c116ab2c Applied patch [ 649599 ] Fixes bug 610850: Inserting a menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 21:23:25 +00:00
Vadim Zeitlin
0cde01aedc removed extra (non existing) Prepend() parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 19:09:18 +00:00
Julian Smart
2f9a4d0e30 Fixed cell visibility test that was causing refresh glitches
in tables (since these were large enough cells to break the
original test)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 18:17:40 +00:00
Václav Slavík
b4eecb7e2f disable version-script on Solaris, it doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 13:54:10 +00:00
Julian Smart
b819b854dd Fixed cell paint background refresh bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 12:53:49 +00:00
Julian Smart
e01893d4ca Added $(EXTRADLLFLAGS) to CFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 08:33:27 +00:00
Robin Dunn
9e05364039 More unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 06:24:15 +00:00
Vadim Zeitlin
bfedf6212c reset virtual root to NULL in DeleteAllItems()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 23:22:38 +00:00
Julian Smart
968bed8c37 Fixed [ 652512 ] wxPaintDC::FindInCache bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 23:21:17 +00:00
Julian Smart
cd501207cf Applied patch [ 654877 ] Missing == != methods in wxRect2DInt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 23:02:24 +00:00
Julian Smart
0fa2e104c5 Partially applied [ 632321 ] XRC object_ref fix
1. Fix object_ref so it at least works, with this I mean
XRC was not even handling the little sample in
tn0014.txt correct.

Hans Van Leemputten (hansvl)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 22:52:48 +00:00
Julian Smart
d1859a1fc1 Added wxUniv project file for dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 22:28:42 +00:00
Julian Smart
ba7fe276d4 Doc corrections
filelist.txt correction and filedlgg.cpp inclusion for wxUniv/MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 22:22:19 +00:00
Robin Dunn
4a69b0600a Added missing #if wxUSE_WAVE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 21:26:21 +00:00
Robin Dunn
18976605f5 Fixed possibility of releasing mouse if the window no longer had it captured
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 20:57:55 +00:00
Vadim Zeitlin
90aaa86507 free argv in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 19:52:06 +00:00
Vadim Zeitlin
d47f8a6ec0 unicode compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 19:49:48 +00:00
Julian Smart
111c1e2c20 Committed Stefan's temporary fix for crashing in Mac Classic.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 17:25:33 +00:00
Julian Smart
fbb2b01c2c Missing semicolon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 11:51:29 +00:00
Julian Smart
2243113487 Further improvements to MFC sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 11:18:09 +00:00
Julian Smart
4cd513abbc MFC sample now works properly; WinMain not defined in wxMSW
if wxUSE_MFC is defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 10:52:10 +00:00
Robin Dunn
55b7aaea10 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 01:36:47 +00:00
Robin Dunn
5bab6390a9 fixed copy/paste error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 23:08:31 +00:00
Robin Dunn
fdec65df6d Misc wxSTC fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 22:35:12 +00:00
Robin Dunn
b829bf55a0 Give wxSafeYield an onlyIfNeeded parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 21:58:36 +00:00
Mattia Barbon
8325937efa Last samples/Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 20:25:28 +00:00
Julian Smart
1bd71df911 Fixed missing checkbox alignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 12:34:06 +00:00
Julian Smart
3d2814f3c3 Updated change log
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 11:11:01 +00:00
Julian Smart
5c8756b04c Applied patch [ 651713 ] changes to convertrc
David J. Cooke (davidjcooke)

amendments to convertrc: add support for
CONTROL... syntax for static, edit, combobox,
buttons, but NOT scrollbar; add support for
embedded quotes in stringtable; other minor changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 11:03:05 +00:00
Julian Smart
7d1dcec23a Applied [ 652962 ] wxProgressDialog::Show(FALSE) bug
This fixes the problem where the application windows
were not being enabled prior to the progress dialog
being hidden in the situation where wxPD_AUTO_HIDE
was not used or was used but the end count was never
reached. This causes random applications to be
activated and brought to the front on Windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:57:48 +00:00
Julian Smart
e5d94b6381 Applied part of patch [ 652965 ] Enables toolbar simple in wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:50:49 +00:00
Julian Smart
ea5ef76f07 Applied patch [ 652894 ] Checklistbox doesn't need owner draw
Updated wxUniv readme about setup[0].h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:45:09 +00:00
Julian Smart
c4c3659cf2 Copy wxUniv setup0.h to setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:36:17 +00:00
Julian Smart
62e819ee45 Removed redundant wxUniv setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:29:03 +00:00
Julian Smart
aab49a0b6a Applied patch [ 654023 ] Enables HtmlHelp (native)
Also fixed the bad event table in helpfrm.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:22:08 +00:00
Julian Smart
37d81cc2e2 Applied [ 654253 ] wxGTK: fix to wxGetMousePosition()
wxGetMousePosition() returns -999, -999 when the mouse
pointer is not over a GTK window. This is apparently
because it uses the current window as a handle to get
to the X display. This is not necessary, however;
GDK_DISPLAY() can be used. With
this patch wxGetMousePosition() works regardless of
where on the screen the mouse is.

Jay Berkenbilt (jay_berkenbilt) modified by JACS


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 09:44:35 +00:00
Vadim Zeitlin
d775acfa77 use system zlib under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 22:50:42 +00:00
Vadim Zeitlin
34bed6d9ec changed version to 2.5.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 22:37:56 +00:00
Vadim Zeitlin
7baf4bdbb6 misc gcc compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 22:30:49 +00:00
Vadim Zeitlin
14ac4f3c54 printf() format warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 22:25:13 +00:00
Julian Smart
d0200d9eff Added Mac Classic fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 21:56:53 +00:00
Vadim Zeitlin
1383482892 send an extra kill focus event when we're deactivated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 18:17:15 +00:00
Mattia Barbon
600683ca05 Fixed all remaining samples/Unicode compilation errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 17:25:36 +00:00
Václav Slavík
ee682a94cb _really_ fixed translation messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 12:38:15 +00:00
Mattia Barbon
42ed75321c More samples/Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 10:23:11 +00:00
Gilles Depeyrot
7cf4f7e21f fix FindMenu broken by implementation of double ampersands in menu and menu
item titles (finding "&File" was no longer working)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:44:48 +00:00
Václav Slavík
7e99eddf64 don't translate strings when it doesn't make any sense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:26:22 +00:00
Václav Slavík
a949e8fac2 removed extremely user-unfriendly translations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:16:58 +00:00
Václav Slavík
59da340790 updated Czech translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:16:41 +00:00
Václav Slavík
118cc185eb fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:16:27 +00:00
Gilles Depeyrot
f6d90fb9ce added commands to search for menus and menu items by label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:12:47 +00:00
Mattia Barbon
ab1ca7b3dd More samples/Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 18:13:27 +00:00
Mattia Barbon
3996031094 Fixed compilation of some more samples in Unicode mode.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 14:23:10 +00:00
Mattia Barbon
196f463f62 Fixed missing reference to wxTreeCtrlnameStr when linking treectrl sample
by adding #include "wx/treectrl.h" to data.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 14:16:14 +00:00
Vadim Zeitlin
2c0a4e08a3 fixed VC++ warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 12:18:49 +00:00
Vadim Zeitlin
0441833277 fixed Unicode compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 12:15:03 +00:00
Julian Smart
b657b4c986 Added missing SetOrientation accessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 09:29:02 +00:00
Václav Slavík
a3671ac092 updated message catalogs from sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 23:53:18 +00:00
Václav Slavík
c742a6ae90 removed a forgotten relict of past: xmlbin format extension still used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 23:50:28 +00:00
Václav Slavík
008a56c968 even more fixes to last-minute wxFileSystem mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 23:50:15 +00:00
Václav Slavík
7a8b9bd950 fixed wxFilesystem docs bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 23:50:04 +00:00
Václav Slavík
4d144d07e7 documented FileNameToURL and URLToFileName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 23:49:19 +00:00
Mattia Barbon
b951c85fec Add WXDLLEXPORT to friend declaration for GCC 3.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 21:35:15 +00:00
Mattia Barbon
9f84eccdea Make some of the samples compile in Unicode mode.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 21:33:14 +00:00
Mattia Barbon
c17ba76f38 Unicode compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 21:28:26 +00:00
Chris Elliott
a2638e741d fix visual c bugs for wxUNIVRERSAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 12:21:19 +00:00
Jouk Jansen
09f8c2a029 Committing in .
Updated OpenVMS compile support

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-13 07:03:47 +00:00
Chris Elliott
e0d8e433c1 fix for cygwin WXDLLEXPORT bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-12 12:06:07 +00:00
Chris Elliott
099d4217df fix for wxUniversal on win32 platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-11 15:10:23 +00:00
Julian Smart
fbb1226068 Applied patch [ 651287 ] adds missing wxTreeCtrl::GetEditControl
This patch implements a missing member in the generic
version of the wxTreeCtrl. The GetEditControl member is
currently not implemented in the generic tree control
used by wxGTK. This patch implements the feature by

1. adding a pointer to the wxTextTreeControl as a
member (m_textCtrl) of the wxGenericTreeCtrl class
2. making sure pointer was initialized to 0
3. using the member variable instead of the stack
variable in the wxGenericTreeCtrl::Edit member
4. making sure the new wxGenericTreeCtrl class
member is set to 0 when the control is set up for
deletion in Finish by calling a new protected member
(ResetTextControl) of the wxGenericTreeCtrl class.

These modification were discussed on the wx-dev list
under the "wxGTK - wxTreeCtrl::GetEditControl status?"
subject.

I have tested, but I certainly welcome comments and
further testing.

Pete Stieber


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-11 09:08:46 +00:00
Julian Smart
03d1ae1799 Applied patch [ 651649 ] Scrollbar not updated without resizing
I always wondered why the scrollbar of the listbox or
the log window (textctrl) never showed a thumb in the
control sample while the combobox does. The
AdjustScrollbars gets called through a size event and
this happens before the listbox (textctrl) can set the
values for the scrollbar. So always an empty scrollbar
is shown. This patch calls AdjustScrollbars at the end
of SetScrollbars in scrlwing.cpp.

I'm not sure if this is the best fix but it works
nicely. I've only tested it with wxUniv but it should
be okay in any generic case.

(applied for __WXUNIVERSAL__ only for now -- JACS)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:50:11 +00:00
Julian Smart
f0e1c34310 Applied patch [ 651383 ] Removes 3 warnings when building w/ CW6
Dimitri Schoolwerth


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:44:08 +00:00
Julian Smart
dda4f6c089 Applied patch [ 651640 ] Toolbar sizing fix
This patch fixes the problem discussed on wx-dev
mailing list. (Message title "wxUniversal: How is the
parent notified when a child changes its size")

In short:
- This patch makes sure the toolbar notifies the parent of
any size change, this will give the parent the opportunity
to resize the frame client size and to make sure the
toolbar is in the right place.

Hans Van Leemputten


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:41:31 +00:00
Mattia Barbon
5e66eee143 "cd utils; make" should not try to compile dialoged unless
wxUSE_RESOURCES=yes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:30:28 +00:00
Mattia Barbon
9ec5e01204 Remove unused g295.t; g95.t works with any GCC from 2.95.2 to 3.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:25:54 +00:00
Julian Smart
66525ca43b Applied another Marco patch (5)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 17:02:37 +00:00
Julian Smart
0a9f0ef7d0 FromString should not fail on wxMac if facename empty.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 16:10:02 +00:00
Vadim Zeitlin
84023968e5 corrected wxCommandProcessor ctor docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 14:09:38 +00:00
Julian Smart
368c9c6d84 Applied some of patch [ 650957 ] wxWinCE diff-0.0.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 12:13:25 +00:00
Julian Smart
c8c29c490b Ignore DOS drive spec in GetRightLocation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 09:48:00 +00:00
Vadim Zeitlin
07243717e2 tried to clean strdup() mess: we now have wxStrdup[AW] which should be always available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 00:43:28 +00:00
Julian Smart
2a5d3f5738 Fixed the beggar good and proper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:45:36 +00:00
Václav Slavík
f3d3a0e751 forgot to add wxHtmlHelpController::AddBook(wxFileName) to the headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:05:56 +00:00
Václav Slavík
1de1d24e96 removed XPM handler from wxImage's standard handlers, let's see if it does any harm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:03:25 +00:00
Julian Smart
9d683b445c Removed duplicate art handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 18:27:10 +00:00
Mattia Barbon
2d6c58d653 The size_type typedef must be public.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 18:08:12 +00:00
Mattia Barbon
27635a90c7 Only build HelpGen in wxBase, since it will #error (this will maybe fix
some tinderboxes...).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 18:06:31 +00:00
Vadim Zeitlin
d7f6918abd removed garbage pixels from the icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 16:43:57 +00:00
Vadim Zeitlin
7e1525b2e7 fixed warning about unused var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 16:42:27 +00:00
Vadim Zeitlin
7bb8798ce7 fixed annoying beep when pressing space/return in the tree
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 16:41:04 +00:00
Julian Smart
dba06cd016 Convert filename to URL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 15:52:29 +00:00
Julian Smart
8ad944dcbc Should only add // under MSW -- not on Unix, not on Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 15:42:10 +00:00
Chris Elliott
969096ef37 fix bug with treectrl sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 15:26:28 +00:00
Julian Smart
76c451b8c1 Added horse3.ani
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 15:10:14 +00:00
Julian Smart
43b8a532e0 Ifdefed m_server
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 14:44:06 +00:00
Julian Smart
3434b611aa Reverted the _n__ fix for now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 14:35:09 +00:00
Julian Smart
1e702ab351 The wxMAKE_UNIQUE_ASSERT_NAME fix for VC++ does not work for MetroWerks CW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 14:20:06 +00:00
Julian Smart
678b263756 Applied patch [ 632115 ] Fixed internationalization on tooltips
wxMac's wxTooltip assumed that text was always PC encoded,
and always converted the string using
wxMacMakeMacStringFromPC(). This worked fine for English
characters, but multi-byte encoded languages such as Japanese
(SJIS) because garbled. I've added a check for
"wxApp::s_macDefaultEncodingIsPC" before performing the
conversion similar to other controls.

Nilesh Agarwalla


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 11:22:43 +00:00
Julian Smart
73145b0ed1 Applied patches by Scott Pleiter:
[ 643866 ] small wxGrid API changes

adds GetValue to the gridcelleditors to facilitate
querying values from the editors, also changes several
methods to virtuals to simplify inheritance.

[ 643867 ] wxGrid cell LNF & behaviour patch

Enables the grid to render its cells grey when the grid
control is disabled. Also fixes several problems when
making the gridcelleditors visible. Improves the layout
of multi-line row/column labels. Changes the CellEditor
show from a MOUSE_DOWN to a MOUSE_UP, this
stops the editor starting when creating a selection
beginging in the currently selected cell.

[ 643868 ] wxGrid rendering tweaks, improves look.

Draw the row/column using system colours. Change the
default wxGrid settings to have a more neutral starting
point - grey lines, non-bold label font, black/white
selection etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 11:14:04 +00:00
Julian Smart
552a0ebdb2 Small WinCE mods from Marco
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 11:01:50 +00:00
Julian Smart
247ef58d1a Added script to convert project files to DOS format.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:57:30 +00:00
Julian Smart
9c136858af Applied patch [ 649284 ] Fix wxODBC to work with MySQL 2.x
The current sample/db fails to build indexes with
MyODBC v2.50.39

This is due to two problems:

(1) wxDb::ModifyColumn() created a SQL statement that
was not correctly formed for MySQL. This problem
caused wxDbTable::CreateIndex() to fail to set the
columns that are going to indexes to be NOT NULL. I
fixed this by added a special case for MySQL.

(2) When creating an Index on a VARCHAR column,
MySQL requires a key length to be specified.
wxDbTable::CreateIndex() current does not do this. I
fixed this problem by adding code to do this.

The attached patch file patches dbtable.cpp and db.cpp
on the 2.5 branch.

gor Mikolic-Torreira


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:50:14 +00:00
Julian Smart
df41317113 Applied patch [ 649590 ] fixes bug 611264: wxFileDialog entry
In bug 611264 I reported that typing a filename into a
multiple selection file dialog failed. The file
returned was "..".

I discovered that this was because the previous
directory folder came up automatically selected when
the dialog was created. Then, I discovered a related
bug. If any file or folder was selected, then that was
the file which was returned regardless of what was
typed in.

To fix the problem I added an EVT_TEXT handler which
deselects everything that is selected when the user
types. The handler does not deselect anything unless
the user actually types something.

This patch implements the fix.

John Skiff


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:44:13 +00:00
Julian Smart
84cff96585 Applied patch [ 642174 ] Stop TOOL_WINDOWS stealing focus
When frames with the wxFRAME_TOOL_WINDOW
style ( i.e. a floating toolbar frame) is shown it is
activated, taking focus from the main application
window. This patch stops frames with the
wxFRAME_TOOL_WINDOW from being activated when
shown.

Scott Pleiter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:31:17 +00:00
Julian Smart
48aa18c000 Applied patch [ 650078 ] Add better checking to wxComboBox
This patch adds extra checks, checks to see and report
if the provided item index is valid.

An other thing:
- IMHO wxComboBox::GetSelection() was wrong, I
corrected this (now it behaves the same as wxMSW,
don't know about wxGTK and others...).

Hans Van Leemputten (hansvl)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:26:21 +00:00
Julian Smart
635eb8bcc4 Applied patch [ 648042 ] Erase background error
When erasing the background with a transparent
background the logical origin of the provided DC is (re)
set, but not restored to the old value. Restoring the old
value is needed because the DC is/can be shared with
the real draw code...

This patch solves problems like mentioned in bug report
#635217 and problems like controls (like radio controls
etc) that disappear when moving the mouse over them or
clicking on them...

Hans Van Leemputten


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:20:44 +00:00
Julian Smart
2a2a71e326 Applied patch [ 642172 ] Fix menu accelerators in ownerdrw
Fixed bug when updating menu text to inform the
ownerdrw code of the new menu accelerator attached to
the menu item.
Improved the layout of the owenerdrw menu ownerdrw to
correctly account for menu accelerators, submenu
arrows etc.

Scott Pleiter

(Note from JACS: I've also changed the sample to show the Quit item
correctly aligned; it needs to have the font set before wxWin knows
it's an ownerdrawn item.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:15:00 +00:00
Julian Smart
1d30a0a132 Applied patch [ 642162 ] restore wxWizard wxEVT_WIZARD_FINISHED
Restore the wxWizard wxEVT_WIZARD_FINISHED
event, which was sent when the FINISHED button was
pressed and the wizard was finished. When the
wxWizard is modal this event is not needed. However,
when the wizard is non-modal this is the only way to
determine that the wizard has finished.

Scott Pleiter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:46:16 +00:00
Julian Smart
7a0363dd04 Applied patch [ 642157 ] [MSW] HMENU resource leak from wxMenuBar
Latest CVS - When a wxMenuBar is detached
from a frame and deleted the HMENU resource leaks.
This patch fixes the leak.

Scott Pleiter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:29:00 +00:00
Julian Smart
fc7c8ae9c3 Applied [ 639060 ] Individual bar floating in contrib/fl
In the current contrib/fl implementation, all control bars
in the frame layout either float or they don't. I added
code to allow the bar floating to be determined on a bar-
by-bar basis. That is, this patch enables some control
bars to float while keeping others locked.

Kevin Yochum


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:21:23 +00:00
Julian Smart
5c6bd4a957 Added missing AddBook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:15:22 +00:00
Julian Smart
77416abdc5 Applied patch [ 638561 ] Allow SetFont(wxNullFont) in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:14:39 +00:00
Vadim Zeitlin
ce788ad93a fixed Get/SetString() prototypes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 00:14:51 +00:00
Vadim Zeitlin
ecb7e58c24 fixed a typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 00:06:20 +00:00
Vadim Zeitlin
8def689d42 replaced wxItem_Xxx with wxITEM_XXX as they should be
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 00:05:29 +00:00
Julian Smart
1b489359c4 Applied patch [ 637982 ] wxComboBox needs margin
wxComboBox doesn't have a margin between the text and
the dropdown button when the default size is used.
Since wxTextctrl currently returns a rather long minmal
size, this error is only visible if a long text (around
20 chars) is used. This patch introduces a margin
(analog wxSpinctrl).

Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 21:43:43 +00:00
Václav Slavík
11d667e7eb use AddBook(wxFileName)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 20:30:56 +00:00
Václav Slavík
fcf77487ed added wxHtmlHelpController::AddBook(wxFileName)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 20:30:42 +00:00
Václav Slavík
cc37ecaf2d fixed tex2rtf error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 20:30:02 +00:00
Václav Slavík
9548c49a6a modifications to URL<->filename conversion: take wxFileName, rename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 20:28:12 +00:00
Mattia Barbon
ec75d791f0 Refactored & cleaned up wxChoice & wxComboBox code, fixed client data
handling, implemented wxControlWIthItems' methods correctly, fixed a
couple of other bugs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 18:48:05 +00:00
Mattia Barbon
21b273736b Added wxClientDataDictionary, used (in wxMotif ATM) to maintain the
association between wxControlWithItems' items and their client data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 18:43:45 +00:00
Mattia Barbon
5fd588d229 Replaced int with size_t where appropriate, added WXDLLEXPORT, corrected
a bug in RemoveAt.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 18:38:46 +00:00
Robert Roebling
df135f2b4d Catching dclick event from a spinbutton or spin control
crashes GTK 1.2 sooner or later. Just disable this
    event for now. Should also be in 2.4, actually.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 18:02:30 +00:00
Roger Gammans
cdbecb3946 Documentation for wxDbGrid from patch 638274
Updates with the aim of improving readability.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 16:10:50 +00:00
Roger Gammans
f24badde9a new member functio of wxDbColInfo to allow two step creation , to be
descibed in the docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 16:04:36 +00:00
Václav Slavík
69a8b5b457 Fixed EVT_TREE_SEL_CHANGED and _CHANGING under MSLU (patch 631815)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:23:03 +00:00
Václav Slavík
e77d4369de XRC assigns ID to wxStaticBox created by including wxStaticBoxSizer (did what patch 632470 was supposed to do)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:22:00 +00:00
Václav Slavík
3acd4349a5 Unicode compilation fixes for treectrl sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:21:33 +00:00
Václav Slavík
64e9f56b80 fixed Vadim's removal of XPM handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 13:20:49 +00:00
Vadim Zeitlin
39bc7d8020 don't add XPM handler in wxInitAllImageHandlers() because it had been already edited in wxImage::nitStandardHandlers()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 00:57:53 +00:00
Vadim Zeitlin
53c9228ead always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc or not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 23:58:13 +00:00
Julian Smart
3ddcf967d6 Committed vcw files also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 16:08:47 +00:00
Julian Smart
6d613d8d4a Converted wxBase also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 16:05:40 +00:00
Robert Roebling
0e0126c220 Various compile fixes for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 15:41:13 +00:00
Stefan Neis
694f2f3cc7 Version number changes.
Added information on how to circumvent make's problems with auto-generated
        .d files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 15:37:00 +00:00
Julian Smart
1b6f93fcfe Corrected line endings, deps now relative
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 15:31:02 +00:00
Robert Roebling
2e8e834c0a Added simplistic makefile/project files for wxWinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 12:38:11 +00:00
Robert Roebling
158b668823 Platform define for wxWinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 12:36:03 +00:00
Julian Smart
7912e6332f Correction to path/URL code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 09:18:44 +00:00
Vadim Zeitlin
dac7d53a83 added semicolons after HASH_MAP macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 02:28:02 +00:00
Vadim Zeitlin
d86939c4c9 removed trailing semicolons at the end of HASH_MAP macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 01:30:47 +00:00
Vadim Zeitlin
5d3f766d26 test that libpng version is > 0.90
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 01:26:21 +00:00
Vadim Zeitlin
136d4499d5 minor visual corrections to renderers (patch 649847)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 01:07:35 +00:00
Vadim Zeitlin
e622dd68c2 fix for wxGetEnv() under Win16 (!) (bug 645368)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 00:58:11 +00:00
Vadim Zeitlin
859e25d4ad suppress warnings when compiling libtiff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 00:43:48 +00:00
Vadim Zeitlin
3993765614 added trivial test for wxTextInputStream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 00:31:56 +00:00
Vadim Zeitlin
d2ec53ea4a fix (?) for small menu item bitmaps (bug 635438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 00:05:03 +00:00
Vadim Zeitlin
6eccc0c485 fixed 3 infinite loops -- the person who tested this code must have had a lot of patience (bug 645761)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:55:55 +00:00
Vadim Zeitlin
de628f984b fixed bug in wxSemaphore::WaitTimeout() which was calling the wrong wxCondition::Wait() (bug 642226 and patch 648859)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:47:34 +00:00
Vadim Zeitlin
2c62b3c3a1 corrected a too eager error message (patch 648599)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:42:16 +00:00
Vadim Zeitlin
285013b384 avoid flicker when doing SetItem() in non report mode (slightly extended patch 647970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:40:11 +00:00
Vadim Zeitlin
c1eb1102aa generate spinctrl event when the button was clicked (slightly modified patch 648013)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:36:01 +00:00
Vadim Zeitlin
801a492c49 Append() returns int, not void
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:27:29 +00:00
Vadim Zeitlin
38c1f6f765 tell to open .dsw file, not .dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 23:24:57 +00:00
Julian Smart
409e38cd65 Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 22:49:58 +00:00
Vadim Zeitlin
adb45366da compilation fix for wxUSE_INTL == 0 (patch 646466)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 21:23:36 +00:00
Vadim Zeitlin
815b393a5a fixed mem leak when using non default theme; change the art provider automatically when the theme is changed (patch 646463)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 21:07:24 +00:00
Vadim Zeitlin
61ecf6d34f fix typo in drawing slider ticks; added assert to check for it (slightly modified patch 646256)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 21:02:50 +00:00
Vadim Zeitlin
f7a201b94e better check of parameter in Delete() (2nd part of patch 646145)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 20:59:06 +00:00
Vadim Zeitlin
d00b880a79 don't leak client data (1st part of patch 646145)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 20:57:56 +00:00
Julian Smart
9b798c66c7 Removed apparently erroneous manipulation of filename/URL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 20:12:48 +00:00
Vadim Zeitlin
513e0cea96 fixed return type of GetEditControl(); updated its description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 17:08:00 +00:00
Stefan Neis
85045dd09e Updated to more OS/2 friendly version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 16:59:38 +00:00
Stefan Neis
42b7406da2 Changed GSocket_Select to use unix code for wxBase, previous code wasn't
detecting loss of connection.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 16:57:30 +00:00
Julian Smart
1257f68432 Added note about opening .dsp files in VC++ .NET
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 14:16:27 +00:00
Robert Roebling
4a6ea63e87 Another attempt to get make win-dist to work with WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 11:50:18 +00:00
Robert Roebling
36d3844cbb Updated Makefile for WinCE (make win-dist)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 11:25:51 +00:00
Stefan Csomor
0ba344c712 print session additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-06 08:07:53 +00:00
Julian Smart
1a4fe894fe Added Marco's first WinCE files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 21:18:30 +00:00
Julian Smart
42280e48f2 Further version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 12:14:53 +00:00
Vadim Zeitlin
5db9e0e80d unabbreviated i18n
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 12:04:51 +00:00
Julian Smart
8473839e3a Added artwork for the emulator, for future reference
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 11:54:50 +00:00
Julian Smart
c31752dadf Updated version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 11:08:08 +00:00
Julian Smart
1353f87837 Makefile.in: remove CVS dirs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 10:27:42 +00:00
Julian Smart
088117622c Checked for stream validity in wxImage::GetImageCount.
use horse3.ani in image sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 10:19:00 +00:00
Vadim Zeitlin
d643b80eb9 detect and don't use old zlib version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 02:07:05 +00:00
Vadim Zeitlin
589c71635a allow TABbing into multiline text controls even if they're not editable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 01:05:59 +00:00
Vadim Zeitlin
b6b2d787e3 compilation fix after recent patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 23:15:10 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
59a944cb63 added test for env var expansion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-28 13:34:28 +00:00
Vadim Zeitlin
4c51b68810 compilation fix in !WXWIN_COMPATIBILITY_2_2 mode; set TEST_ALL to 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-28 13:29:22 +00:00
Vadim Zeitlin
01cb1c2617 added ctor taking wxFontFlags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-02 23:58:52 +00:00
David Webster
7bfbbc0efb Fixups in jpeg lib for multiplely defined symbolsa under VisualAge for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 16:01:49 +00:00
David Webster
376ef4a1f4 Weekly OS/2 updtaes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 15:59:35 +00:00
David Webster
13053f649b os2 update to rc file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 15:56:35 +00:00
David Webster
841346f01f removed ctl3d32.lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-11 13:44:31 +00:00
Roman Rolinsky
d21441bd9b just a test if CVS access works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-04 07:19:19 +00:00
Stefan Neis
ef4d6ce8e4 Fixed some typos that occured in applying patch 606235.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-20 15:08:03 +00:00
Jouk Jansen
1507adbb8c Committing in .
Updated OpenVMS configuration

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-19 06:17:39 +00:00
Julian Smart
942e06785c Added scripts to make a minimal wxMSW distribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-16 19:20:38 +00:00
Julian Smart
4a28b9b81c Updated date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-16 16:03:59 +00:00
David Webster
243116066d nativedlg and some interface changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-16 04:56:00 +00:00
David Webster
923b48fc63 virtual function hiding problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-16 04:54:25 +00:00
David Webster
c09245191c OS/2 fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-16 04:53:42 +00:00
Stefan Csomor
bf4a027ddb added arrow cursor for standard controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-15 18:32:49 +00:00
Vadim Zeitlin
418b74a078 don't mention GUI-only changes in the base section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-15 18:17:32 +00:00
6704 changed files with 1034306 additions and 408788 deletions

View File

@@ -25,10 +25,14 @@ Release
Debug
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
DebugUnicodeDLL
UnivRelease
UnivDebug
BaseRelease
BaseDebug
BaseReleaseDLL
BaseDebugDLL
robert
stamp-h.in
Makefile

View File

@@ -19,30 +19,33 @@ varaibles and PATH entries.
Continue with item c) below.
b) If using the GNU Mingw32 or GNU Cygwin32 compilers
b) If using the MinGW or Cygwin compilers
You can get Mingw32 from http://www.mingw.org
You can get MinGW from http://www.mingw.org/
Cygwin32 is available at http://www.cygwin.com
Cygwin is available at http://sources.redhat.com/cygwin/
The makefile might have small problems with Cygwin's tools
so it is recommended to use Mingw32 and its toolchain instead
if possible.
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
-> If your are using an old Mingw32 version (gcc-2.95 or older),
you might need to fix some headers with the patches contained
in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
PATCHES BY HAND! There are apparently a few different versions
of the headers floating around. Note that these patches are
not needed if you are using Mingw32 gcc-2.95.2 or newer.
-> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
If using MINGW32, also set the MINGW32VERSION variable
appropiately.
-> 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
@@ -51,35 +54,30 @@ c) Build instructions
into c:\wxWin
-> Copy c:\wxWin\include\wx\msw\setup0.h
to c:\wxWin\include\wx\msw\setup.h
-> Edit c:\wxWin\include\wx\msw\setup.h so that
most features are enabled (i.e. defined to 1), for example:
#define wxUSE_ODBC 0
#define wxUSE_SOCKETS 1
#define wxUSE_HTML 1
#define wxUSE_THREADS 1
#define wxUSE_FS_INET 0
#define wxUSE_FS_ZIP 1
#define wxUSE_BUSYINFO 1
#define wxUSE_DYNLIB_CLASS 1
#define wxUSE_ZIPSTREAM 1
#define wxUSE_LIBJPEG 1
#define wxUSE_LIBPNG 1
-> Edit c:\wxWin\include\wx\msw\setup.h to choose
the features you would like to compile wxWindows with[out].
and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0
-> type: cd c:\wxWin\src\msw
-> type: make -f makefile.g95 (if using GNU tools)
-> type: cd c:\wxWin\build\win32
-> type: make -f makefile.gcc (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++)
etc.
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/
See docs/msw/install.txt for details; in brief
-> type set WXWIN=c:\wxwindows
-> type cd %WXWIN%\src\msw
-> type make -f makefile.b32
-> type cd %WXWIN%\build\win32
-> type make -f makefile.bcc
You can customize many things in the build process, detailed description is
in docs/msw/install.txt.
II) Unix ports
--------------
@@ -90,10 +88,11 @@ 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.13 or 2.14) installed
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).
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).
@@ -117,11 +116,10 @@ yet complete).
III) Windows using configure
----------------------------------------
Take a look at Unix->Windows cross compiling. With minor
modifications, this should work in Windows if you've got the cygnus
utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
See http://www.cygnus.com for these programs, or go straight to their
ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
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).
@@ -151,7 +149,7 @@ 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.13 or 2.14) installed
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).
@@ -168,17 +166,17 @@ VI) OS/2
VII) Unix->Windows cross-compiling using configure
--------------------------------------------------
First you'll need a cross-compiler; linux glibc binaries of mingw32 and
cygwin32 (both based on egcs) can be found at
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
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
Otherwise you can compile one yourself.
[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
[ 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 mingw32 is
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
@@ -203,7 +201,7 @@ yourself:
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
../configure --host=i586-mingw32 --with-mingw
(all assuming you're using mingw32)
(all assuming you're using MinGW)
By default this will compile a DLL, if you want a static library,
specify --disable-shared.
@@ -215,7 +213,7 @@ 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)
mingw32 headers which may be corrected by upgrading your compier,
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
@@ -238,7 +236,7 @@ typedef void *__gnuc_va_list;
__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 ).
(or just libwx_msw.a if you opted for a static build).
Now try building the minimal sample:
-> cd samples/minimal

17865
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,169 +0,0 @@
*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999
--- basetyps.h Fri Aug 06 11:14:36 1999
***************
*** 74,91 ****
--- 74,97 ----
STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
}
#define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+ #ifndef GUID_DEFINED
+ #define GUID_DEFINED
typedef struct _GUID
{
unsigned long Data1;
unsigned short Data2;
unsigned short Data3;
unsigned char Data4[8];
} GUID;
+ #endif /* GUID_DEFINED */
typedef GUID *REFGUID;
typedef GUID *LPGUID;
+ #ifndef UUID_DEFINED
+ #define UUID_DEFINED
typedef GUID UUID;
+ #endif /* UUID_DEFINED */
typedef GUID IID;
typedef GUID CLSID;
typedef CLSID *LPCLSID;
typedef IID *LPIID;
*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999
--- oaidl.h Fri Aug 06 13:18:48 1999
***************
*** 39,44 ****
--- 39,53 ----
#define IMPLTYPEFLAG_FRESTRICTED 4
#define IMPLTYPEFLAG_FDEFAULTVTABLE 8
+ #define DISPID_UNKNOWN ( -1 )
+ #define DISPID_VALUE ( 0 )
+ #define DISPID_PROPERTYPUT ( -3 )
+ #define DISPID_NEWENUM ( -4 )
+ #define DISPID_EVALUATE ( -5 )
+ #define DISPID_CONSTRUCTOR ( -6 )
+ #define DISPID_DESTRUCTOR ( -7 )
+ #define DISPID_COLLECT ( -8 )
+
typedef interface ITypeLib *LPTYPELIB;
typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
***************
*** 49,54 ****
--- 58,73 ----
typedef interface IDispatch *LPDISPATCH;
typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
+ extern "C" const IID IID_ITypeLib;
+ extern "C" const IID IID_ICreateTypeInfo;
+ extern "C" const IID IID_ICreateTypeInfo2;
+ extern "C" const IID IID_ICreateTypeLib;
+ extern "C" const IID IID_ICreateTypeLib2;
+ extern "C" const IID IID_ITypeInfo;
+ extern "C" const IID IID_IErrorInfo;
+ extern "C" const IID IID_IDispatch;
+ extern "C" const IID IID_ICreateErrorInfo;
+
typedef enum tagSYSKIND {
SYS_WIN16,SYS_WIN32,SYS_MAC
} SYSKIND;
***************
*** 375,382 ****
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID)
PURE;
! STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
};
#ifdef __cplusplus
--- 394,401 ----
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*)
PURE;
! STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
};
#ifdef __cplusplus
*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999
--- objidl.h Fri Aug 06 11:00:19 1999
***************
*** 627,633 ****
STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE;
STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
--- 627,633 ----
STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
--- i386-mingw32\include\stdio.h Sun Aug 1 06:18:20 1999
+++ stdio.h Sun Nov 7 03:41:40 1999
@@ -203,9 +203,12 @@
int fprintf (FILE* filePrintTo, const char* szFormat, ...);
int printf (const char* szFormat, ...);
int sprintf (char* caBuffer, const char* szFormat, ...);
+int _snprintf (char* caBuffer, size_t n, const char* szFormat, ...);
int vfprintf (FILE* filePrintTo, const char* szFormat, va_list varg);
int vprintf (const char* szFormat, va_list varg);
int vsprintf (char* caBuffer, const char* szFormat, va_list varg);
+int _vsnprintf (char* caBuffer, size_t n, const char* szFormat,
+ va_list varg);
/* Wide character versions */
int fwprintf (FILE* filePrintTo, const wchar_t* wsFormat, ...);
--- i386-mingw32\include\winbase.h Sat Jul 31 17:48:48 1999
+++ winbase.h Fri Feb 25 01:49:08 2000
@@ -989,7 +989,7 @@
BOOL WINAPI CopyFileExW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD);
#define RtlMoveMemory memmove
#define RtlCopyMemory memcpy
-#define RtlFillMemory memset
+#define RtlFillMemory(d,l,f) memset ((d),(f),(l))
#define RtlZeroMemory(d,l) memset((d),0,(l))
#define MoveMemory RtlMoveMemory
#define CopyMemory RtlCopyMemory
--- i386-mingw32\include\winsock.h Sat Jul 31 17:48:50 1999
+++ winsock.h Mon Mar 20 13:47:12 2000
@@ -13,6 +13,10 @@
#define _GNU_H_WINDOWS32_SOCKETS
#include <windows.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef _SYS_TYPES_H
typedef unsigned char u_char;
typedef unsigned short u_short;
@@ -495,4 +499,9 @@
typedef struct timeval TIMEVAL;
typedef struct timeval *PTIMEVAL;
typedef struct timeval *LPTIMEVAL;
+
+#ifdef __cplusplus
+}
#endif
+#endif
+

View File

@@ -19,7 +19,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1;
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
@@ -35,7 +35,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
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
@@ -51,13 +51,17 @@ dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
ac_path_to_include=$1
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
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
])
@@ -378,6 +382,59 @@ AC_DEFUN([WX_ARG_ENABLE],
])
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
@@ -523,3 +580,21 @@ if test "$enable_largefile" != no; then
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
])

930
aclocal.m4 vendored
View File

@@ -1,14 +1,15 @@
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
dnl ---------------------------------------------------------------------------
dnl
@@ -31,7 +32,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1;
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
@@ -47,7 +48,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
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
@@ -63,13 +64,17 @@ dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
ac_path_to_include=$1
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
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
])
@@ -349,6 +354,10 @@ AC_DEFUN([WX_ARG_WITH],
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
@@ -386,6 +395,59 @@ AC_DEFUN([WX_ARG_ENABLE],
])
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
@@ -532,6 +594,24 @@ if test "$enable_largefile" != no; then
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
])
# Configure paths for GTK+
# Owen Taylor 1997-2001
@@ -729,64 +809,6 @@ main ()
rm -f conf.gtktest
])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
# Configure paths for GTK+
# Owen Taylor 97-11-3
@@ -982,3 +1004,763 @@ main ()
rm -f conf.gtktest
])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
dnl ---------------------------------------------------------------------------
dnl Support macros for makefiles generated by BAKEFILE.
dnl ---------------------------------------------------------------------------
dnl Lots of compiler & linker detection code contained here was taken from
dnl wxWindows configure.in script (see http://www.wxwindows.org)
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_GNUMAKE
dnl
dnl Detects GNU make
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_GNUMAKE,
[
dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], bakefile_cv_prog_makeisgnu,
[
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU > /dev/null); then
bakefile_cv_prog_makeisgnu="yes"
else
bakefile_cv_prog_makeisgnu="no"
fi
])
if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
AC_SUBST(IF_GNU_MAKE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_PLATFORM
dnl
dnl Detects platform and sets PLATFORM_XXX variables accordingly
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_PLATFORM,
[
PLATFORM_UNIX=0
PLATFORM_WIN32=0
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
PLATFORM_OS2=0
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
PLATFORM_WIN32=1
;;
*-pc-msdosdjgpp )
PLATFORM_MSDOS=1
;;
*-pc-os2_emx | *-pc-os2-emx )
PLATFORM_OS2=1
;;
powerpc-*-darwin* )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
;;
* )
PLATFORM_UNIX=1
;;
esac
AC_SUBST(PLATFORM_UNIX)
AC_SUBST(PLATFORM_WIN32)
AC_SUBST(PLATFORM_MSDOS)
AC_SUBST(PLATFORM_MAC)
AC_SUBST(PLATFORM_MACOSX)
AC_SUBST(PLATFORM_OS2)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SUFFIXES
dnl
dnl Detects shared various suffixes for shared libraries, libraries, programs,
dnl plugins etc.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SUFFIXES,
[
SO_SUFFIX="so"
SO_SUFFIX_MODULE="so"
EXEEXT=""
LIBPREFIX=lib
DLLPREFIX=lib
DLLPREFIX_MODULE=
case "${host}" in
*-hp-hpux* )
SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;;
*-*-aix* )
dnl quoting from
dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
dnl Both archive libraries and shared libraries on AIX have an
dnl .a extension. This will explain why you can't link with an
dnl .so and why it works with the name changed to .a.
SO_SUFFIX="a"
SO_SUFFIX_MODULE="a"
;;
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll"
EXEEXT=".exe"
DLLPREFIX=""
;;
*-pc-msdosdjgpp )
EXEEXT=".exe"
DLLPREFIX=""
;;
*-pc-os2_emx | *-pc-os2-emx )
EXEEXT=".exe"
DLLPREFIX=""
LIBPREFIX=""
;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
SO_SUFFIX_MODULE="bundle"
;;
esac
AC_SUBST(SO_SUFFIX)
AC_SUBST(SO_SUFFIX_MODULE)
AC_SUBST(EXEEXT)
AC_SUBST(LIBPREFIX)
AC_SUBST(DLLPREFIX)
AC_SUBST(DLLPREFIX_MODULE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SHARED_LD
dnl
dnl Detects command for making shared libraries, substitutes SHARED_LD_CC
dnl and SHARED_LD_CXX.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SHARED_LD,
[
dnl Defaults for GCC and ELF .so shared libs:
SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o"
dnl the extra compiler flags needed for compilation of shared library
if test "x$GCC" = "xyes"; then
dnl the switch for gcc is the same under all platforms
PIC_FLAG="-fPIC"
fi
case "${host}" in
*-hp-hpux* )
dnl default settings are good for gcc but not for the native HP-UX
if test "x$GCC" = "xyes"; then
dnl -o flag must be after PIC flag
SHARED_LD_CC="${CC} -shared ${PIC_FLAG} -o"
SHARED_LD_CXX="${CXX} -shared ${PIC_FLAG} -o"
else
dnl no idea why it wants it, but it does
LDFLAGS="$LDFLAGS -L/usr/lib"
SHARED_LD_CC="${CC} -b -o"
SHARED_LD_CXX="${CXX} -b -o"
PIC_FLAG="+Z"
fi
;;
*-*-linux* )
if test "x$GCC" != "xyes"; then
AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
[
AC_TRY_COMPILE([],
[
#ifndef __INTEL_COMPILER
#error Not icc
#endif
],
bakefile_cv_prog_icc=yes,
bakefile_cv_prog_icc=no
)
])
if test "$bakefile_cv_prog_icc" = "yes"; then
PIC_FLAG="-KPIC"
fi
fi
;;
*-*-solaris2* )
if test "x$GCC" != xyes ; then
SHARED_LD_CC="${CC} -G -o"
SHARED_LD_CXX="${CXX} -G -o"
PIC_FLAG="-KPIC"
fi
;;
*-*-darwin* )
dnl For Unix to MacOS X porting instructions, see:
dnl http://fink.sourceforge.net/doc/porting/porting.html
CFLAGS="$CFLAGS -fno-common"
CXXFLAGS="$CXXFLAGS -fno-common"
dnl Most apps benefit from being fully binded (its faster and static
dnl variables initialized at startup work).
dnl This can be done either with the exe linker flag -Wl,-bind_at_load
dnl or with a double stage link in order to create a single module
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
cat <<EOF >shared-ld-sh
#!/bin/sh
#-----------------------------------------------------------------------------
#-- Name: distrib/mac/shared-ld-sh
#-- Purpose: Link a mach-o dynamic shared library for Darwin / Mac OS X
#-- Author: Gilles Depeyrot
#-- Copyright: (c) 2002 Gilles Depeyrot
#-- Licence: any use permitted
#-----------------------------------------------------------------------------
verbose=0
args=""
objects=""
linking_flag="-dynamiclib"
while test \${#} -gt 0; do
case \${1} in
-v)
verbose=1
;;
-o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
# collect these options and values
args="\${args} \${1} \${2}"
shift
;;
-l*|-L*|-flat_namespace)
# collect these options
args="\${args} \${1}"
;;
-dynamiclib|-bundle)
linking_flag="\${1}"
;;
-*)
echo "shared-ld: unhandled option '\${1}'"
exit 1
;;
*.o | *.a | *.dylib)
# collect object files
objects="\${objects} \${1}"
;;
*)
echo "shared-ld: unhandled argument '\${1}'"
exit 1
;;
esac
shift
done
#
# Link one module containing all the others
#
if test \${verbose} = 1; then
echo "c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o"
fi
c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o
status=\$?
if test \${status} != 0; then
exit \${status}
fi
#
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
fi
#
# Remove intermediate module
#
rm -f master.\$\$.o
exit 0
EOF
chmod +x shared-ld-sh
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
PIC_FLAG="-dynamic -fPIC"
dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
dnl matter for C projects and matters for C++ ones
dnl FIXME - newer devel tools have linker flag to do this, the script
dnl is not necessary - detect!
;;
*-*-aix* )
dnl default settings are ok for gcc
if test "x$GCC" != "xyes"; then
dnl the abs path below used to be hardcoded here so I guess it must
dnl be some sort of standard location under AIX?
AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
dnl FIXME - what about makeCSharedLib?
SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
fi
;;
*-*-beos* )
dnl can't use gcc under BeOS for shared library creation because it
dnl complains about missing 'main'
SHARED_LD_CC="${LD} -shared -o"
SHARED_LD_CXX="${LD} -shared -o"
;;
*-*-irix* )
dnl default settings are ok for gcc
if test "x$GCC" != "xyes"; then
PIC_FLAG="-KPIC"
fi
;;
*-*-cygwin* | *-*-mingw32* )
PIC_FLAG=""
;;
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
*-pc-os2_emx | *-pc-os2-emx | \
*-*-sysv5* )
dnl defaults are ok
;;
*)
AC_MSG_ERROR(unknown system type $host.)
esac
if test "x$SHARED_LD_MODULE_CC" = "x" ; then
SHARED_LD_MODULE_CC="$SHARED_LD_CC"
fi
if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
SHARED_LD_MODULE_CXX="$SHARED_LD_CXX"
fi
AC_SUBST(SHARED_LD_CC)
AC_SUBST(SHARED_LD_CXX)
AC_SUBST(SHARED_LD_MODULE_CC)
AC_SUBST(SHARED_LD_MODULE_CXX)
AC_SUBST(PIC_FLAG)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_SHARED_VERSIONS
dnl
dnl Detects linker options for attaching versions (sonames) to shared libs.
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
[
USE_SOVERSION=0
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
case "${host}" in
*-*-linux* )
SONAME_FLAG="-Wl,-soname,"
USE_SOVERSION=1
USE_SOVERLINUX=1
USE_SOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
USE_SOSYMLINKS=1
;;
esac
AC_SUBST(USE_SOVERSION)
AC_SUBST(USE_SOVERLINUX)
AC_SUBST(USE_SOVERSOLARIS)
AC_SUBST(USE_MACVERSION)
AC_SUBST(USE_SOSYMLINKS)
AC_SUBST(SONAME_FLAG)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_DEPS
dnl
dnl Detects available C/C++ dependency tracking options
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_DEPS,
[
AC_MSG_CHECKING([for dependency tracking method])
DEPS_TRACKING=0
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
DEPS_TRACKING=1
case "${host}" in
powerpc-*-darwin* )
dnl -cpp-precomp (the default) conflicts with -MMD option
dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
DEPSFLAG_GCC="-no-cpp-precomp -MMD"
;;
* )
DEPSFLAG_GCC="-MMD"
;;
esac
AC_MSG_RESULT([gcc])
else
AC_MSG_RESULT([none])
fi
if test $DEPS_TRACKING = 1 ; then
cat <<EOF >bk-deps
#!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
# script. It is used to track C/C++ files dependencies in portable way.
#
# Permission is given to use this file in any way.
DEPSMODE=$DEPSMODE
DEPSDIR=.deps
DEPSFLAG_GCC="$DEPSFLAG_GCC"
mkdir -p \$DEPSDIR
if test \$DEPSMODE = gcc ; then
\${*} \${DEPSFLAG_GCC}
status=\${?}
if test \${status} != 0 ; then
exit \${status}
fi
# move created file to the location we want it in:
while test \${#} -gt 0; do
case "\${1}" in
-o )
shift
objfile=\${1}
;;
-* )
;;
* )
srcfile=\${1}
;;
esac
shift
done
depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\`
depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\`
if test -f \$depfile ; then
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
rm -f \$depfile
else
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
if test -f \$depfile ; then
sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
rm -f \$depfile
fi
fi
exit 0
else
\${*}
exit \${?}
fi
EOF
chmod +x bk-deps
fi
AC_SUBST(DEPS_TRACKING)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_CHECK_BASIC_STUFF
dnl
dnl Checks for presence of basic programs, such as C and C++ compiler, "ranlib"
dnl or "install"
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
[
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_SUBST(MAKE_SET)
if test "$build" != "$host" ; then
AR=$host_alias-ar
STRIP=$host_alias-strip
else
AC_CHECK_PROG(AR, ar, ar, ar)
AC_CHECK_PROG(STRIP, strip, strip, true)
fi
case ${host} in
*-hp-hpux* )
INSTALL_DIR="mkdir"
;;
*) INSTALL_DIR="$INSTALL -d"
;;
esac
AC_SUBST(INSTALL_DIR)
LDFLAGS_GUI=
case ${host} in
*-*-cygwin* | *-*-mingw32* )
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
esac
AC_SUBST(LDFLAGS_GUI)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_RES_COMPILERS
dnl
dnl Checks for presence of resource compilers for win32 or mac
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
[
RESCOMP=
SETFILE=
case ${host} in
*-*-cygwin* | *-*-mingw32* )
dnl Check for win32 resources compiler:
if test "$build" != "$host" ; then
RESCOMP=$host_alias-windres
else
AC_CHECK_PROG(RESCOMP, windres, windres, windres)
fi
;;
*-*-darwin* )
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
;;
esac
AC_SUBST(RESCOMP)
AC_SUBST(SETFILE)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE_PRECOMP_HEADERS
dnl
dnl Check for precompiled headers support (GCC >= 3.4)
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS,
[
AC_ARG_ENABLE([precomp-headers],
[ --disable-precomp-headers don't use precompiled headers even if compiler can],
[bk_use_pch="$enableval"])
GCC_PCH=0
if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
if test "x$GCC" = "xyes"; then
dnl test if we have gcc-3.4:
AC_MSG_CHECKING([if the compiler supports precompiled headers])
AC_TRY_COMPILE([],
[
#if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
#error "no pch support"
#endif
#if (__GNUC__ < 3)
#error "no pch support"
#endif
#if (__GNUC__ == 3) && \
((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
#error "no pch support"
#endif
],
[
AC_MSG_RESULT([yes])
dnl FIXME - this is temporary, till .gch dependencies
dnl are fixed in generated Makefiles
CPPFLAGS="-fpch-deps $CPPFLAGS"
GCC_PCH=1
],
[
AC_MSG_RESULT([no])
])
if test $GCC_PCH = 1 ; then
cat <<EOF >bk-make-pch
#!/bin/sh
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
# script. It is used to generated precompiled headers.
#
# Permission is given to use this file in any way.
outfile="\${1}"
header="\${2}"
shift
shift
compiler=
headerfile=
while test \${#} -gt 0; do
case "\${1}" in
-I* )
incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\`
if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then
headerfile="\${incdir}/\${header}"
fi
;;
esac
compiler="\${compiler} \${1}"
shift
done
if test "x\${headerfile}" = "x" ; then
echo "error: can't find header \${header} in include paths" >2
else
if test -f \${outfile} ; then
rm -f \${outfile}
else
mkdir -p \`dirname \${outfile}\`
fi
depsfile=".deps/\`basename \${outfile}\`.d"
mkdir -p .deps
# can do this because gcc is >= 3.4:
\${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}"
exit \${?}
fi
EOF
chmod +x bk-make-pch
fi
fi
fi
AC_SUBST(GCC_PCH)
])
dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE
dnl
dnl To be used in configure.in of any project using Bakefile-generated mks
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE,
[
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
AC_BAKEFILE_CHECK_BASIC_STUFF
fi
AC_BAKEFILE_GNUMAKE
AC_BAKEFILE_PLATFORM
AC_BAKEFILE_SUFFIXES
AC_BAKEFILE_SHARED_LD
AC_BAKEFILE_SHARED_VERSIONS
AC_BAKEFILE_DEPS
AC_BAKEFILE_RES_COMPILERS
builtin(include, autoconf_inc.m4)
])

41
art/missimg.xpm Normal file
View File

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

BIN
art/wxwin.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
art/wxwin16x16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

25
art/wxwin16x16.xpm Normal file
View File

@@ -0,0 +1,25 @@
/* 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.",
".+++++. .......",
"....... ",
" ",
" "};

BIN
art/wxwin32x32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

41
art/wxwin32x32.xpm Normal file
View File

@@ -0,0 +1,41 @@
/* 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.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

558
autoconf_inc.m4 Normal file
View File

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

4216
build/bakefiles/Makefile Normal file

File diff suppressed because it is too large Load Diff

493
build/bakefiles/common.bkl Normal file
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

231
build/bakefiles/config.bkl Normal file
View File

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

33
build/bakefiles/expat.bkl Normal file
View File

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

2303
build/bakefiles/files.bkl Normal file

File diff suppressed because it is too large Load Diff

74
build/bakefiles/jpeg.bkl Normal file
View File

@@ -0,0 +1,74 @@
<?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

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

1139
build/bakefiles/make_dist.mk Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

42
build/bakefiles/odbc.bkl Normal file
View File

@@ -0,0 +1,42 @@
<?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

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

45
build/bakefiles/png.bkl Normal file
View File

@@ -0,0 +1,45 @@
<?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>

248
build/bakefiles/regenMakefile.py Executable file
View File

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

29
build/bakefiles/regex.bkl Normal file
View File

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

66
build/bakefiles/tiff.bkl Normal file
View File

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

191
build/bakefiles/wx.bkl Normal file
View File

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

147
build/bakefiles/wxwin.py Normal file
View File

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

39
build/bakefiles/zlib.bkl Normal file
View File

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

128
build/msw/config.bcc Normal file
View File

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

84
build/msw/config.gcc Normal file
View File

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

88
build/msw/config.vc Normal file
View File

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

81
build/msw/config.wat Normal file
View File

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

9228
build/msw/makefile.bcc Normal file

File diff suppressed because it is too large Load Diff

9703
build/msw/makefile.gcc Normal file

File diff suppressed because it is too large Load Diff

9780
build/msw/makefile.vc Normal file

File diff suppressed because it is too large Load Diff

9899
build/msw/makefile.wat Normal file

File diff suppressed because it is too large Load Diff

184
build/msw/wx.dsw Normal file
View File

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

805
build/msw/wx_adv.dsp Normal file
View File

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

1327
build/msw/wx_base.dsp Normal file

File diff suppressed because it is too large Load Diff

8603
build/msw/wx_core.dsp Normal file

File diff suppressed because it is too large Load Diff

649
build/msw/wx_dbgrid.dsp Normal file
View File

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

302
build/msw/wx_dll.dsw Normal file
View File

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

645
build/msw/wx_gl.dsp Normal file
View File

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

801
build/msw/wx_html.dsp Normal file
View File

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

738
build/msw/wx_net.dsp Normal file
View File

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

661
build/msw/wx_odbc.dsp Normal file
View File

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

451
build/msw/wx_wxexpat.dsp Normal file
View File

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

623
build/msw/wx_wxjpeg.dsp Normal file
View File

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

507
build/msw/wx_wxpng.dsp Normal file
View File

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

455
build/msw/wx_wxregex.dsp Normal file
View File

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

571
build/msw/wx_wxtiff.dsp Normal file
View File

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

495
build/msw/wx_wxzlib.dsp Normal file
View File

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

661
build/msw/wx_xml.dsp Normal file
View File

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

427
config.guess vendored
View File

@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002 Free Software Foundation, Inc.
timestamp='2001-09-04'
timestamp='2002-11-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-09-04'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Written by Per Bothner <bothner@cygnus.com>.
# Please send patches to <config-patches@gnu.org>.
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -87,30 +88,40 @@ if test $# != 0; then
exit 1
fi
trap 'exit 1' 1 2 15
dummy=dummy-$$
trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int dummy(){}" > $dummy.c ;
for c in cc gcc c89 ; do
($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
if test $? = 0 ; then
# This shell variable is my proudest work .. or something. --bje
set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
|| (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
dummy=$tmpdir/dummy ;
files="$dummy.c $dummy.o $dummy.rel $dummy" ;
trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
rm -f $dummy.c $dummy.o $dummy.rel ;
rm -f $files ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
esac'
esac ;
unset files'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +138,30 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# Netbsd (nbsd) targets should (where applicable) match one or
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
# Determine the machine/vendor (is the vendor relevant).
case "${UNAME_MACHINE}" in
amiga) machine=m68k-unknown ;;
arm32) machine=arm-unknown ;;
atari*) machine=m68k-atari ;;
sun3*) machine=m68k-sun ;;
mac68k) machine=m68k-apple ;;
macppc) machine=powerpc-apple ;;
hp3[0-9][05]) machine=m68k-hp ;;
ibmrt|romp-ibm) machine=romp-ibm ;;
*) machine=${UNAME_MACHINE}-unknown ;;
#
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE}" in
i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
case "${UNAME_MACHINE_ARCH}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
@@ -166,12 +178,62 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# The OS release
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
case "${UNAME_VERSION}" in
Debian*)
release='-gnu'
;;
*)
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
macppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mipseb-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -180,6 +242,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
eval $set_cc_for_build
cat <<EOF >$dummy.s
.data
\$Lformat:
@@ -205,10 +268,9 @@ main:
jsr \$26,exit
.end main
EOF
eval $set_cc_for_build
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
if test "$?" = 0 ; then
case `./$dummy` in
case `$dummy` in
0-0)
UNAME_MACHINE="alpha"
;;
@@ -230,9 +292,12 @@ EOF
2-1307)
UNAME_MACHINE="alphaev68"
;;
3-1307)
UNAME_MACHINE="alphaev7"
;;
esac
fi
rm -f $dummy.s $dummy
rm -f $dummy.s $dummy && rmdir $tmpdir
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
@@ -247,29 +312,11 @@ EOF
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit 0;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
arc64:OpenBSD:*:*)
echo mips64el-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hkmips:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -291,6 +338,10 @@ EOF
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
@@ -319,7 +370,7 @@ EOF
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -333,12 +384,6 @@ EOF
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
sparc*:NetBSD:*)
echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
exit 0 ;;
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -365,18 +410,6 @@ EOF
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
sun3*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
@@ -415,15 +448,21 @@ EOF
exit (-1);
}
EOF
$CC_FOR_BUILD $dummy.c -o $dummy \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
$CC_FOR_BUILD -o $dummy $dummy.c \
&& $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
exit 0 ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -496,8 +535,8 @@ EOF
exit(0);
}
EOF
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -506,7 +545,7 @@ EOF
fi
exit 0 ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
@@ -546,10 +585,8 @@ EOF
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
case "${HPUX_REV}" in
11.[0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,13 +595,13 @@ EOF
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
fi ;;
esac
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -597,10 +634,10 @@ EOF
exit (0);
}
EOF
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
rm -f $dummy.c $dummy
fi ;;
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
rm -f $dummy.c $dummy && rmdir $tmpdir
fi ;;
esac
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
@@ -635,8 +672,8 @@ EOF
exit (0);
}
EOF
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -664,9 +701,6 @@ EOF
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
hppa*:OpenBSD:*:*)
echo hppa-unknown-openbsd
exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -685,9 +719,6 @@ EOF
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
CRAY*X-MP:*:*:*)
echo xmp-cray-unicos
exit 0 ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
@@ -709,18 +740,12 @@ EOF
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -731,10 +756,19 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
# Determine whether the default compiler uses glibc.
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <features.h>
#if __GLIBC__ >= 2
LIBC=gnu
#else
LIBC=
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
rm -f $dummy.c && rmdir $tmpdir
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -745,11 +779,17 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
x86:Interix*:3*)
echo i586-pc-interix3
exit 0 ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i386-pc-interix
echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
@@ -770,16 +810,50 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
mips:Linux:*:*)
case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
big) echo mips-unknown-linux-gnu && exit 0 ;;
little) echo mipsel-unknown-linux-gnu && exit 0 ;;
esac
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips
#undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
rm -f $dummy.c && rmdir $tmpdir
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips64
#undef mips64el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mips64el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips64
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
rm -f $dummy.c && rmdir $tmpdir
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
@@ -828,7 +902,8 @@ EOF
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
ld_supported_targets=`cd /; ld --help 2>&1 \
# Set LC_ALL=C to ensure ld outputs messages in English.
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
s/.*supported targets: *//
@@ -840,7 +915,7 @@ EOF
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit 0 ;;
exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;;
@@ -852,32 +927,29 @@ EOF
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
#endif
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
printf ("%s-pc-linux-gnu\n", argv[1]);
# else
printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
# else
printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
sed 's/^ //' << EOF >$dummy.c
#include <features.h>
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
LIBC=gnu
# else
LIBC=gnulibc1
# endif
# else
LIBC=gnulibc1
# endif
#else
#ifdef __INTEL_COMPILER
LIBC=gnu
#else
LIBC=gnuaout
#endif
#endif
EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
rm -f $dummy.c && rmdir $tmpdir
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
i*86:DYNIX/ptx:4*:*)
@@ -894,6 +966,23 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -915,22 +1004,19 @@ EOF
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -954,9 +1040,15 @@ EOF
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
exit 0 ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -973,9 +1065,6 @@ EOF
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1047,6 +1136,9 @@ EOF
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
@@ -1057,15 +1149,17 @@ EOF
echo `uname -p`-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
if test "${UNAME_MACHINE}" = "x86pc"; then
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
echo `uname -p`-${UNAME_MACHINE}-nto-qnx
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
NSR-[KW]:NONSTOP_KERNEL:*:*)
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1088,11 +1182,6 @@ EOF
fi
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
exit 0 ;;
@@ -1111,12 +1200,6 @@ EOF
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1237,8 +1320,8 @@ main ()
}
EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
# Apollos put the system type in the environment.

35869
configure vendored

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -13,3 +13,6 @@ clean:
samples:
cd samples; $(MAKE)
install:
cd src; $(MAKE) install

View File

@@ -0,0 +1,32 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<set var="ANIMATE_SRC">
animate.cpp
</set>
<headers template="wx_contrib_headers">
<files>
wx/animate/animate.h
</files>
</headers>
<dll id="animatedll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ANIMATE</define>
<sources>$(ANIMATE_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="animatelib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(ANIMATE_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatelib+animatedll</set>
</makefile>

View File

@@ -0,0 +1,467 @@
# Microsoft Developer Studio Project File - Name="animate" - 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=animate - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "animate.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 "animate.mak" CFG="animate - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "animate - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "animate - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /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:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25d_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25d_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\msw" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\msw" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /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:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /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:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25d_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25d_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /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:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25ud_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25ud_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25d_animate.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25d_animate.lib" /debug
!ELSEIF "$(CFG)" == "animate - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\msw" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\msw" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25_animate.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25ud_animate.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25ud_animate.lib" /debug
!ELSEIF "$(CFG)" == "animate - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25u_animate.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25u_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25d_animate.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25d_animate.lib" /debug
!ELSEIF "$(CFG)" == "animate - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25_animate.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25_animate.lib"
!ELSEIF "$(CFG)" == "animate - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25ud_animate.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25ud_animate.lib" /debug
!ELSEIF "$(CFG)" == "animate - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\animate"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\animate"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25u_animate.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25u_animate.lib"
!ENDIF
# Begin Target
# Name "animate - Win32 Debug"
# Name "animate - Win32 Release"
# Name "animate - Win32 Unicode Debug"
# Name "animate - Win32 Unicode Release"
# Name "animate - Win32 Universal Debug"
# Name "animate - Win32 Universal Release"
# Name "animate - Win32 Universal Unicode Debug"
# Name "animate - Win32 Universal Unicode Release"
# Name "animate - Win32 DLL Debug"
# Name "animate - Win32 DLL Release"
# Name "animate - Win32 DLL Unicode Debug"
# Name "animate - Win32 DLL Unicode Release"
# Name "animate - Win32 DLL Universal Debug"
# Name "animate - Win32 DLL Universal Release"
# Name "animate - Win32 DLL Universal Unicode Debug"
# Name "animate - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/animate\animate.cpp
# End Source File
# Begin Source File
SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# End Target
# End Project

View File

@@ -0,0 +1,16 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "animate"=animate.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,197 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!ifndef BCCDIR
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatedll.csm
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.obj \
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\animate\..\..\include $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_animatelib.csm
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.obj \
$(OBJS)\animatelib_animate.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = -O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(SHARED)" == "1"
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__animatelib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(ANIMATELIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(ANIMATELIB_OBJECTS)
|
!endif
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib

View File

@@ -0,0 +1,182 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
$(CXXFLAGS)
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.o \
$(OBJS)\animatedll_animate.o
ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\animate\..\..\include $(CXXFLAGS)
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.o \
$(OBJS)\animatelib_animate.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g
endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(SHARED),1)
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__animatelib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
$(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS)
$(CXX) -shared -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a: $(ANIMATELIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(ANIMATELIB_OBJECTS)
ranlib $@
endif
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
.PHONY: all clean

View File

@@ -0,0 +1,258 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE \
$(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatedll.pch"
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.obj \
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\animate\..\..\include $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_animatelib.pch"
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.obj \
$(OBJS)\animatelib_animate.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = /Zi
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_12 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_12 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_12 = $(__DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_11_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_11_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_2_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_2_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
!if "$(SHARED)" == "1"
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__animatelib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $**
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(ANIMATEDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(ANIMATELIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(ANIMATELIB_OBJECTS)
<<
!endif
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib

View File

@@ -0,0 +1,247 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
# Speed up compilation a bit:
!ifdef __LOADDLL__
! loaddll wcc wccd
! loaddll wccaxp wccdaxp
! loaddll wcc386 wccd386
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! loaddll wlink wlink
! loaddll wlib wlibd
!endif
# We need these variables in some bakefile-made rules:
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
__OPTIMIZEFLAG = -ot -ox
!endif
__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
__RUNTIME_LIBS =
!endif
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__animatedll___depname =
!ifeq SHARED 1
__animatedll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
!endif
__animatelib___depname =
!ifeq SHARED 0
__animatelib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!endif
### Variables: ###
ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\animate\..\..\include -dWXUSINGDLL &
-dWXMAKINGDLL_ANIMATE $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch
ANIMATEDLL_OBJECTS = &
$(OBJS)\animatedll_dummy.obj &
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\animate\..\..\include $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_animatelib.pch
ANIMATELIB_OBJECTS = &
$(OBJS)\animatelib_dummy.obj &
$(OBJS)\animatelib_animate.obj
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__animatedll___depname) $(__animatelib___depname)
$(OBJS)\animatedll_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll : $(ANIMATEDLL_OBJECTS)
@%create $(OBJS)\animatedll.lbc
@%append $(OBJS)\animatedll.lbc option quiet
@%append $(OBJS)\animatedll.lbc name $^@
@%append $(OBJS)\animatedll.lbc option caseexact
@%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\animatedll.lbc library %i
@%append $(OBJS)\animatedll.lbc
@%append $(OBJS)\animatedll.lbc system nt_dll
wlink @$(OBJS)\animatedll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +$^@
!endif
!ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib : $(ANIMATELIB_OBJECTS)
@%create $(OBJS)\animatelib.lbc
@for %i in ($(ANIMATELIB_OBJECTS)) do @%append $(OBJS)\animatelib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\animatelib.lbc
!endif
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib

View File

@@ -0,0 +1,55 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<set var="DEPRECATED_SRC" hints="files">
prop.cpp
propform.cpp
proplist.cpp
resource.cpp
tbarsmpl.cpp
treelay.cpp
wxexpr.cpp
<!--
these should be generated from lexer.l and parser.y, but
since this is deprecated anyway, why bother?
-->
dosyacc.c
</set>
<headers template="wx_contrib_headers">
<files>
wx/deprecated/expr.h
wx/deprecated/prop.h
wx/deprecated/propform.h
wx/deprecated/proplist.h
wx/deprecated/resource.h
wx/deprecated/setup.h
wx/deprecated/tbarsmpl.h
wx/deprecated/treelay.h
wx/deprecated/wxexpr.h
</files>
</headers>
<dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DEPRECATED</define>
<include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
<include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecatedlib+deprecateddll</set>
</makefile>

View File

@@ -0,0 +1,495 @@
# Microsoft Developer Studio Project File - Name="deprecated" - 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=deprecated - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "deprecated.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 "deprecated.mak" CFG="deprecated - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "deprecated - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "deprecated - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /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:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /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:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /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:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /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:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25d_deprecated.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25d_deprecated.lib" /debug
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25_deprecated.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25ud_deprecated.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25ud_deprecated.lib" /debug
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25u_deprecated.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25u_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25d_deprecated.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25d_deprecated.lib" /debug
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25_deprecated.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25_deprecated.lib"
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25ud_deprecated.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25ud_deprecated.lib" /debug
!ELSEIF "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\deprecated"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\deprecated"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25u_deprecated.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25u_deprecated.lib"
!ENDIF
# Begin Target
# Name "deprecated - Win32 Debug"
# Name "deprecated - Win32 Release"
# Name "deprecated - Win32 Unicode Debug"
# Name "deprecated - Win32 Unicode Release"
# Name "deprecated - Win32 Universal Debug"
# Name "deprecated - Win32 Universal Release"
# Name "deprecated - Win32 Universal Unicode Debug"
# Name "deprecated - Win32 Universal Unicode Release"
# Name "deprecated - Win32 DLL Debug"
# Name "deprecated - Win32 DLL Release"
# Name "deprecated - Win32 DLL Unicode Debug"
# Name "deprecated - Win32 DLL Unicode Release"
# Name "deprecated - Win32 DLL Universal Debug"
# Name "deprecated - Win32 DLL Universal Release"
# Name "deprecated - Win32 DLL Universal Unicode Debug"
# Name "deprecated - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/deprecated\dosyacc.c
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\..\..\..\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/deprecated\prop.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\propform.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\proplist.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\resource.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\tbarsmpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\treelay.cpp
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\wxexpr.cpp
# End Source File
# End Group
# End Target
# End Project

View File

@@ -0,0 +1,16 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "deprecated"=deprecated.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,264 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!ifndef BCCDIR
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-I..\..\src\deprecated $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-I..\..\src\deprecated $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.obj \
$(OBJS)\deprecateddll_prop.obj \
$(OBJS)\deprecateddll_propform.obj \
$(OBJS)\deprecateddll_proplist.obj \
$(OBJS)\deprecateddll_resource.obj \
$(OBJS)\deprecateddll_tbarsmpl.obj \
$(OBJS)\deprecateddll_treelay.obj \
$(OBJS)\deprecateddll_wxexpr.obj \
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_deprecatedlib.csm
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.obj \
$(OBJS)\deprecatedlib_prop.obj \
$(OBJS)\deprecatedlib_propform.obj \
$(OBJS)\deprecatedlib_proplist.obj \
$(OBJS)\deprecatedlib_resource.obj \
$(OBJS)\deprecatedlib_tbarsmpl.obj \
$(OBJS)\deprecatedlib_treelay.obj \
$(OBJS)\deprecatedlib_wxexpr.obj \
$(OBJS)\deprecatedlib_dosyacc.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = -O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(SHARED)" == "1"
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__deprecatedlib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDLIB_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) -H $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj $(DEPRECATEDLIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(DEPRECATEDLIB_OBJECTS)
|
!endif

View File

@@ -0,0 +1,250 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
-DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-I..\..\src\deprecated $(CXXFLAGS)
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.o \
$(OBJS)\deprecateddll_prop.o \
$(OBJS)\deprecateddll_propform.o \
$(OBJS)\deprecateddll_proplist.o \
$(OBJS)\deprecateddll_resource.o \
$(OBJS)\deprecateddll_tbarsmpl.o \
$(OBJS)\deprecateddll_treelay.o \
$(OBJS)\deprecateddll_wxexpr.o \
$(OBJS)\deprecateddll_dosyacc.o
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \
$(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS)
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.o \
$(OBJS)\deprecatedlib_prop.o \
$(OBJS)\deprecatedlib_propform.o \
$(OBJS)\deprecatedlib_proplist.o \
$(OBJS)\deprecatedlib_resource.o \
$(OBJS)\deprecatedlib_tbarsmpl.o \
$(OBJS)\deprecatedlib_treelay.o \
$(OBJS)\deprecatedlib_wxexpr.o \
$(OBJS)\deprecatedlib_dosyacc.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g
endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(SHARED),1)
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__deprecatedlib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $<
$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_prop.o: ../../src/deprecated/prop.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_propform.o: ../../src/deprecated/propform.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated/proplist.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_resource.o: ../../src/deprecated/resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated/treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $<
$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated/propform.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated/proplist.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated/resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated/treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated/wxexpr.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS)
$(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a: $(DEPRECATEDLIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(DEPRECATEDLIB_OBJECTS)
ranlib $@
endif
.PHONY: all clean

View File

@@ -0,0 +1,330 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
/I..\..\src\deprecated $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
/I..\..\src\deprecated $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_deprecateddll.pch"
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.obj \
$(OBJS)\deprecateddll_prop.obj \
$(OBJS)\deprecateddll_propform.obj \
$(OBJS)\deprecateddll_proplist.obj \
$(OBJS)\deprecateddll_resource.obj \
$(OBJS)\deprecateddll_tbarsmpl.obj \
$(OBJS)\deprecateddll_treelay.obj \
$(OBJS)\deprecateddll_wxexpr.obj \
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CXXFLAGS) /GR \
/GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecatedlib.pch"
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.obj \
$(OBJS)\deprecatedlib_prop.obj \
$(OBJS)\deprecatedlib_propform.obj \
$(OBJS)\deprecatedlib_proplist.obj \
$(OBJS)\deprecatedlib_resource.obj \
$(OBJS)\deprecatedlib_tbarsmpl.obj \
$(OBJS)\deprecatedlib_treelay.obj \
$(OBJS)\deprecatedlib_wxexpr.obj \
$(OBJS)\deprecatedlib_dosyacc.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = /Zi
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_12 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_12 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_12 = $(__DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_11_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_11_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_2_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_2_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
!if "$(SHARED)" == "1"
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__deprecatedlib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDLIB_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(DEPRECATEDDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj $(DEPRECATEDLIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(DEPRECATEDLIB_OBJECTS)
<<
!endif

View File

@@ -0,0 +1,314 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
# Speed up compilation a bit:
!ifdef __LOADDLL__
! loaddll wcc wccd
! loaddll wccaxp wccdaxp
! loaddll wcc386 wccd386
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! loaddll wlink wlink
! loaddll wlib wlibd
!endif
# We need these variables in some bakefile-made rules:
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
__OPTIMIZEFLAG = -ot -ox
!endif
__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
__RUNTIME_LIBS =
!endif
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__deprecateddll___depname =
!ifeq SHARED 1
__deprecateddll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
!endif
__deprecatedlib___depname =
!ifeq SHARED 0
__deprecatedlib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!endif
### Variables: ###
DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_deprecateddll.pch
DEPRECATEDDLL_OBJECTS = &
$(OBJS)\deprecateddll_dummy.obj &
$(OBJS)\deprecateddll_prop.obj &
$(OBJS)\deprecateddll_propform.obj &
$(OBJS)\deprecateddll_proplist.obj &
$(OBJS)\deprecateddll_resource.obj &
$(OBJS)\deprecateddll_tbarsmpl.obj &
$(OBJS)\deprecateddll_treelay.obj &
$(OBJS)\deprecateddll_wxexpr.obj &
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
-i=..\..\src\deprecated $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
-i=..\..\src\deprecated $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecatedlib.pch
DEPRECATEDLIB_OBJECTS = &
$(OBJS)\deprecatedlib_dummy.obj &
$(OBJS)\deprecatedlib_prop.obj &
$(OBJS)\deprecatedlib_propform.obj &
$(OBJS)\deprecatedlib_proplist.obj &
$(OBJS)\deprecatedlib_resource.obj &
$(OBJS)\deprecatedlib_tbarsmpl.obj &
$(OBJS)\deprecatedlib_treelay.obj &
$(OBJS)\deprecatedlib_wxexpr.obj &
$(OBJS)\deprecatedlib_dosyacc.obj
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__deprecateddll___depname) $(__deprecatedlib___depname)
$(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_propform.obj : .AUTODEPEND ../../src/deprecated\propform.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_proplist.obj : .AUTODEPEND ../../src/deprecated\proplist.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_tbarsmpl.obj : .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecatedlib_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_propform.obj : .AUTODEPEND ../../src/deprecated\propform.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_proplist.obj : .AUTODEPEND ../../src/deprecated\proplist.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_tbarsmpl.obj : .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS)
@%create $(OBJS)\deprecateddll.lbc
@%append $(OBJS)\deprecateddll.lbc option quiet
@%append $(OBJS)\deprecateddll.lbc name $^@
@%append $(OBJS)\deprecateddll.lbc option caseexact
@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\deprecateddll.lbc library %i
@%append $(OBJS)\deprecateddll.lbc
@%append $(OBJS)\deprecateddll.lbc system nt_dll
wlink @$(OBJS)\deprecateddll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +$^@
!endif
!ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib : $(DEPRECATEDLIB_OBJECTS)
@%create $(OBJS)\deprecatedlib.lbc
@for %i in ($(DEPRECATEDLIB_OBJECTS)) do @%append $(OBJS)\deprecatedlib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\deprecatedlib.lbc
!endif

67
contrib/build/fl/fl.bkl Normal file
View File

@@ -0,0 +1,67 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<set var="FL_SRC">
antiflickpl.cpp
bardragpl.cpp
barhintspl.cpp
cbcustom.cpp
controlbar.cpp
dyntbar.cpp
dyntbarhnd.cpp
frmview.cpp
garbagec.cpp
gcupdatesmgr.cpp
hintanimpl.cpp
newbmpbtn.cpp
panedrawpl.cpp
rowdragpl.cpp
rowlayoutpl.cpp
toolwnd.cpp
updatesmgr.cpp
</set>
<headers template="wx_contrib_headers">
<files>
wx/fl/antiflickpl.h
wx/fl/bardragpl.h
wx/fl/barhintspl.h
wx/fl/cbcustom.h
wx/fl/controlbar.h
wx/fl/dynbarhnd.h
wx/fl/dyntbar.h
wx/fl/dyntbarhnd.h
wx/fl/fldefs.h
wx/fl/frmview.h
wx/fl/garbagec.h
wx/fl/gcupdatesmgr.h
wx/fl/hintanimpl.h
wx/fl/newbmpbtn.h
wx/fl/panedrawpl.h
wx/fl/rowdragpl.h
wx/fl/rowlayoutpl.h
wx/fl/toolwnd.h
wx/fl/updatesmgr.h
</files>
</headers>
<dll id="fldll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_FL</define>
<sources>$(FL_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="fllib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(FL_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fllib+fldll</set>
</makefile>

531
contrib/build/fl/fl.dsp Normal file
View File

@@ -0,0 +1,531 @@
# Microsoft Developer Studio Project File - Name="fl" - 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=fl - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "fl.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 "fl.mak" CFG="fl - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "fl - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "fl - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /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:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25d_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25d_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /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:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /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:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25d_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25d_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /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:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25ud_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25ud_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25d_fl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25d_fl.lib" /debug
!ELSEIF "$(CFG)" == "fl - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\msw" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\msw" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25_fl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25ud_fl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25ud_fl.lib" /debug
!ELSEIF "$(CFG)" == "fl - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25u_fl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25u_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25d_fl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25d_fl.lib" /debug
!ELSEIF "$(CFG)" == "fl - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25_fl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25_fl.lib"
!ELSEIF "$(CFG)" == "fl - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25ud_fl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25ud_fl.lib" /debug
!ELSEIF "$(CFG)" == "fl - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\fl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\fl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25u_fl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25u_fl.lib"
!ENDIF
# Begin Target
# Name "fl - Win32 Debug"
# Name "fl - Win32 Release"
# Name "fl - Win32 Unicode Debug"
# Name "fl - Win32 Unicode Release"
# Name "fl - Win32 Universal Debug"
# Name "fl - Win32 Universal Release"
# Name "fl - Win32 Universal Unicode Debug"
# Name "fl - Win32 Universal Unicode Release"
# Name "fl - Win32 DLL Debug"
# Name "fl - Win32 DLL Release"
# Name "fl - Win32 DLL Unicode Debug"
# Name "fl - Win32 DLL Unicode Release"
# Name "fl - Win32 DLL Universal Debug"
# Name "fl - Win32 DLL Universal Release"
# Name "fl - Win32 DLL Universal Unicode Debug"
# Name "fl - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/fl\antiflickpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\bardragpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\barhintspl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\cbcustom.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\controlbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\..\..\..\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/fl\dyntbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\dyntbarhnd.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\frmview.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\garbagec.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\gcupdatesmgr.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\hintanimpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\newbmpbtn.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\panedrawpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\rowdragpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\rowlayoutpl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\toolwnd.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\updatesmgr.cpp
# End Source File
# End Group
# End Target
# End Project

16
contrib/build/fl/fl.dsw Normal file
View File

@@ -0,0 +1,16 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "fl"=fl.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,323 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!ifndef BCCDIR
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm
FLDLL_OBJECTS = \
$(OBJS)\fldll_dummy.obj \
$(OBJS)\fldll_antiflickpl.obj \
$(OBJS)\fldll_bardragpl.obj \
$(OBJS)\fldll_barhintspl.obj \
$(OBJS)\fldll_cbcustom.obj \
$(OBJS)\fldll_controlbar.obj \
$(OBJS)\fldll_dyntbar.obj \
$(OBJS)\fldll_dyntbarhnd.obj \
$(OBJS)\fldll_frmview.obj \
$(OBJS)\fldll_garbagec.obj \
$(OBJS)\fldll_gcupdatesmgr.obj \
$(OBJS)\fldll_hintanimpl.obj \
$(OBJS)\fldll_newbmpbtn.obj \
$(OBJS)\fldll_panedrawpl.obj \
$(OBJS)\fldll_rowdragpl.obj \
$(OBJS)\fldll_rowlayoutpl.obj \
$(OBJS)\fldll_toolwnd.obj \
$(OBJS)\fldll_updatesmgr.obj
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\fl\..\..\include $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_fllib.csm
FLLIB_OBJECTS = \
$(OBJS)\fllib_dummy.obj \
$(OBJS)\fllib_antiflickpl.obj \
$(OBJS)\fllib_bardragpl.obj \
$(OBJS)\fllib_barhintspl.obj \
$(OBJS)\fllib_cbcustom.obj \
$(OBJS)\fllib_controlbar.obj \
$(OBJS)\fllib_dyntbar.obj \
$(OBJS)\fllib_dyntbarhnd.obj \
$(OBJS)\fllib_frmview.obj \
$(OBJS)\fllib_garbagec.obj \
$(OBJS)\fllib_gcupdatesmgr.obj \
$(OBJS)\fllib_hintanimpl.obj \
$(OBJS)\fllib_newbmpbtn.obj \
$(OBJS)\fllib_panedrawpl.obj \
$(OBJS)\fllib_rowdragpl.obj \
$(OBJS)\fllib_rowlayoutpl.obj \
$(OBJS)\fllib_toolwnd.obj \
$(OBJS)\fllib_updatesmgr.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = -O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(SHARED)" == "1"
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__fllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(FLLIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(FLLIB_OBJECTS)
|
!endif

View File

@@ -0,0 +1,309 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS)
FLDLL_OBJECTS = \
$(OBJS)\fldll_dummy.o \
$(OBJS)\fldll_antiflickpl.o \
$(OBJS)\fldll_bardragpl.o \
$(OBJS)\fldll_barhintspl.o \
$(OBJS)\fldll_cbcustom.o \
$(OBJS)\fldll_controlbar.o \
$(OBJS)\fldll_dyntbar.o \
$(OBJS)\fldll_dyntbarhnd.o \
$(OBJS)\fldll_frmview.o \
$(OBJS)\fldll_garbagec.o \
$(OBJS)\fldll_gcupdatesmgr.o \
$(OBJS)\fldll_hintanimpl.o \
$(OBJS)\fldll_newbmpbtn.o \
$(OBJS)\fldll_panedrawpl.o \
$(OBJS)\fldll_rowdragpl.o \
$(OBJS)\fldll_rowlayoutpl.o \
$(OBJS)\fldll_toolwnd.o \
$(OBJS)\fldll_updatesmgr.o
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\fl\..\..\include $(CXXFLAGS)
FLLIB_OBJECTS = \
$(OBJS)\fllib_dummy.o \
$(OBJS)\fllib_antiflickpl.o \
$(OBJS)\fllib_bardragpl.o \
$(OBJS)\fllib_barhintspl.o \
$(OBJS)\fllib_cbcustom.o \
$(OBJS)\fllib_controlbar.o \
$(OBJS)\fllib_dyntbar.o \
$(OBJS)\fllib_dyntbarhnd.o \
$(OBJS)\fllib_frmview.o \
$(OBJS)\fllib_garbagec.o \
$(OBJS)\fllib_gcupdatesmgr.o \
$(OBJS)\fllib_hintanimpl.o \
$(OBJS)\fllib_newbmpbtn.o \
$(OBJS)\fllib_panedrawpl.o \
$(OBJS)\fllib_rowdragpl.o \
$(OBJS)\fllib_rowlayoutpl.o \
$(OBJS)\fllib_toolwnd.o \
$(OBJS)\fllib_updatesmgr.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g
endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(SHARED),1)
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__fllib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
$(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_bardragpl.o: ../../src/fl/bardragpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_barhintspl.o: ../../src/fl/barhintspl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_cbcustom.o: ../../src/fl/cbcustom.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_controlbar.o: ../../src/fl/controlbar.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbar.o: ../../src/fl/dyntbar.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_frmview.o: ../../src/fl/frmview.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_garbagec.o: ../../src/fl/garbagec.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_hintanimpl.o: ../../src/fl/hintanimpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_panedrawpl.o: ../../src/fl/panedrawpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowdragpl.o: ../../src/fl/rowdragpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_bardragpl.o: ../../src/fl/bardragpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_barhintspl.o: ../../src/fl/barhintspl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_cbcustom.o: ../../src/fl/cbcustom.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_controlbar.o: ../../src/fl/controlbar.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbar.o: ../../src/fl/dyntbar.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_frmview.o: ../../src/fl/frmview.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_garbagec.o: ../../src/fl/garbagec.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_hintanimpl.o: ../../src/fl/hintanimpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_panedrawpl.o: ../../src/fl/panedrawpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowdragpl.o: ../../src/fl/rowdragpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_toolwnd.o: ../../src/fl/toolwnd.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_updatesmgr.o: ../../src/fl/updatesmgr.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS)
$(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a: $(FLLIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(FLLIB_OBJECTS)
ranlib $@
endif
.PHONY: all clean

View File

@@ -0,0 +1,384 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
$(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include \
/I$(SETUPHDIR) /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \
$(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fldll.pch"
FLDLL_OBJECTS = \
$(OBJS)\fldll_dummy.obj \
$(OBJS)\fldll_antiflickpl.obj \
$(OBJS)\fldll_bardragpl.obj \
$(OBJS)\fldll_barhintspl.obj \
$(OBJS)\fldll_cbcustom.obj \
$(OBJS)\fldll_controlbar.obj \
$(OBJS)\fldll_dyntbar.obj \
$(OBJS)\fldll_dyntbarhnd.obj \
$(OBJS)\fldll_frmview.obj \
$(OBJS)\fldll_garbagec.obj \
$(OBJS)\fldll_gcupdatesmgr.obj \
$(OBJS)\fldll_hintanimpl.obj \
$(OBJS)\fldll_newbmpbtn.obj \
$(OBJS)\fldll_panedrawpl.obj \
$(OBJS)\fldll_rowdragpl.obj \
$(OBJS)\fldll_rowlayoutpl.obj \
$(OBJS)\fldll_toolwnd.obj \
$(OBJS)\fldll_updatesmgr.obj
FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \
$(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include \
/I$(SETUPHDIR) /I..\..\src\fl\..\..\include $(CXXFLAGS) /GR /GX \
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch"
FLLIB_OBJECTS = \
$(OBJS)\fllib_dummy.obj \
$(OBJS)\fllib_antiflickpl.obj \
$(OBJS)\fllib_bardragpl.obj \
$(OBJS)\fllib_barhintspl.obj \
$(OBJS)\fllib_cbcustom.obj \
$(OBJS)\fllib_controlbar.obj \
$(OBJS)\fllib_dyntbar.obj \
$(OBJS)\fllib_dyntbarhnd.obj \
$(OBJS)\fllib_frmview.obj \
$(OBJS)\fllib_garbagec.obj \
$(OBJS)\fllib_gcupdatesmgr.obj \
$(OBJS)\fllib_hintanimpl.obj \
$(OBJS)\fllib_newbmpbtn.obj \
$(OBJS)\fllib_panedrawpl.obj \
$(OBJS)\fllib_rowdragpl.obj \
$(OBJS)\fllib_rowlayoutpl.obj \
$(OBJS)\fllib_toolwnd.obj \
$(OBJS)\fllib_updatesmgr.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = /Zi
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_12 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_12 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_12 = $(__DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_11_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_11_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_2_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_2_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
!if "$(SHARED)" == "1"
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__fllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(FLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(FLLIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(FLLIB_OBJECTS)
<<
!endif

View File

@@ -0,0 +1,374 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
# Speed up compilation a bit:
!ifdef __LOADDLL__
! loaddll wcc wccd
! loaddll wccaxp wccdaxp
! loaddll wcc386 wccd386
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! loaddll wlink wlink
! loaddll wlib wlibd
!endif
# We need these variables in some bakefile-made rules:
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
__OPTIMIZEFLAG = -ot -ox
!endif
__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
__RUNTIME_LIBS =
!endif
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__fldll___depname =
!ifeq SHARED 1
__fldll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll
!endif
__fllib___depname =
!ifeq SHARED 0
__fllib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!endif
### Variables: ###
FLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_fldll.pch
FLDLL_OBJECTS = &
$(OBJS)\fldll_dummy.obj &
$(OBJS)\fldll_antiflickpl.obj &
$(OBJS)\fldll_bardragpl.obj &
$(OBJS)\fldll_barhintspl.obj &
$(OBJS)\fldll_cbcustom.obj &
$(OBJS)\fldll_controlbar.obj &
$(OBJS)\fldll_dyntbar.obj &
$(OBJS)\fldll_dyntbarhnd.obj &
$(OBJS)\fldll_frmview.obj &
$(OBJS)\fldll_garbagec.obj &
$(OBJS)\fldll_gcupdatesmgr.obj &
$(OBJS)\fldll_hintanimpl.obj &
$(OBJS)\fldll_newbmpbtn.obj &
$(OBJS)\fldll_panedrawpl.obj &
$(OBJS)\fldll_rowdragpl.obj &
$(OBJS)\fldll_rowlayoutpl.obj &
$(OBJS)\fldll_toolwnd.obj &
$(OBJS)\fldll_updatesmgr.obj
FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\fl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_fllib.pch
FLLIB_OBJECTS = &
$(OBJS)\fllib_dummy.obj &
$(OBJS)\fllib_antiflickpl.obj &
$(OBJS)\fllib_bardragpl.obj &
$(OBJS)\fllib_barhintspl.obj &
$(OBJS)\fllib_cbcustom.obj &
$(OBJS)\fllib_controlbar.obj &
$(OBJS)\fllib_dyntbar.obj &
$(OBJS)\fllib_dyntbarhnd.obj &
$(OBJS)\fllib_frmview.obj &
$(OBJS)\fllib_garbagec.obj &
$(OBJS)\fllib_gcupdatesmgr.obj &
$(OBJS)\fllib_hintanimpl.obj &
$(OBJS)\fllib_newbmpbtn.obj &
$(OBJS)\fllib_panedrawpl.obj &
$(OBJS)\fllib_rowdragpl.obj &
$(OBJS)\fllib_rowlayoutpl.obj &
$(OBJS)\fllib_toolwnd.obj &
$(OBJS)\fllib_updatesmgr.obj
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__fldll___depname) $(__fllib___depname)
$(OBJS)\fldll_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_bardragpl.obj : .AUTODEPEND ../../src/fl\bardragpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_barhintspl.obj : .AUTODEPEND ../../src/fl\barhintspl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_cbcustom.obj : .AUTODEPEND ../../src/fl\cbcustom.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_controlbar.obj : .AUTODEPEND ../../src/fl\controlbar.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbar.obj : .AUTODEPEND ../../src/fl\dyntbar.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_dyntbarhnd.obj : .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_frmview.obj : .AUTODEPEND ../../src/fl\frmview.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_garbagec.obj : .AUTODEPEND ../../src/fl\garbagec.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_gcupdatesmgr.obj : .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_hintanimpl.obj : .AUTODEPEND ../../src/fl\hintanimpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_newbmpbtn.obj : .AUTODEPEND ../../src/fl\newbmpbtn.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_panedrawpl.obj : .AUTODEPEND ../../src/fl\panedrawpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowdragpl.obj : .AUTODEPEND ../../src/fl\rowdragpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_rowlayoutpl.obj : .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_bardragpl.obj : .AUTODEPEND ../../src/fl\bardragpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_barhintspl.obj : .AUTODEPEND ../../src/fl\barhintspl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_cbcustom.obj : .AUTODEPEND ../../src/fl\cbcustom.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_controlbar.obj : .AUTODEPEND ../../src/fl\controlbar.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbar.obj : .AUTODEPEND ../../src/fl\dyntbar.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_dyntbarhnd.obj : .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_frmview.obj : .AUTODEPEND ../../src/fl\frmview.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_garbagec.obj : .AUTODEPEND ../../src/fl\garbagec.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_gcupdatesmgr.obj : .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_hintanimpl.obj : .AUTODEPEND ../../src/fl\hintanimpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_newbmpbtn.obj : .AUTODEPEND ../../src/fl\newbmpbtn.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_panedrawpl.obj : .AUTODEPEND ../../src/fl\panedrawpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowdragpl.obj : .AUTODEPEND ../../src/fl\rowdragpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_rowlayoutpl.obj : .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll : $(FLDLL_OBJECTS)
@%create $(OBJS)\fldll.lbc
@%append $(OBJS)\fldll.lbc option quiet
@%append $(OBJS)\fldll.lbc name $^@
@%append $(OBJS)\fldll.lbc option caseexact
@%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\fldll.lbc library %i
@%append $(OBJS)\fldll.lbc
@%append $(OBJS)\fldll.lbc system nt_dll
wlink @$(OBJS)\fldll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +$^@
!endif
!ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(FLLIB_OBJECTS)
@%create $(OBJS)\fllib.lbc
@for %i in ($(FLLIB_OBJECTS)) do @%append $(OBJS)\fllib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\fllib.lbc
!endif

View File

@@ -0,0 +1,43 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<set var="GIZMOS_SRC">
dynamicsash.cpp
editlbox.cpp
ledctrl.cpp
multicell.cpp
splittree.cpp
statpict.cpp
</set>
<headers template="wx_contrib_headers">
<files>
wx/gizmos/dynamicsash.h
wx/gizmos/editlbox.h
wx/gizmos/ledctrl.h
wx/gizmos/multicell.h
wx/gizmos/splittree.h
wx/gizmos/statpict.h
wx/gizmos/gizmos.h
</files>
</headers>
<dll id="gizmosdll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GIZMOS</define>
<sources>$(GIZMOS_SRC)</sources>
<wx-lib>base</wx-lib>
<wx-lib>core</wx-lib>
</dll>
<lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(GIZMOS_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
</makefile>

View File

@@ -0,0 +1,487 @@
# Microsoft Developer Studio Project File - Name="gizmos" - 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=gizmos - Win32 DLL Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "gizmos.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 "gizmos.mak" CFG="gizmos - Win32 DLL Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gizmos - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "gizmos - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswd\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /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:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_msw\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /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:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswud\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswu\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivd\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /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:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswuniv\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /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:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivud\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP BASE Intermediate_Dir "vc_mswunivu\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswddll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25d_gizmos.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25d_gizmos.lib" /debug
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswdll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25_gizmos.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswuddll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25ud_gizmos.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25ud_gizmos.lib" /debug
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswudll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25u_gizmos.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw250u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25u_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Universal Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivddll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25d_gizmos.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25d_gizmos.lib" /debug
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Universal Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivdll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25_gizmos.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25_gizmos.lib"
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivuddll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25ud_gizmos.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25ud_gizmos.lib" /debug
!ELSEIF "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP BASE Intermediate_Dir "vc_mswunivudll\gizmos"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\gizmos"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25u_gizmos.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv250u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25u_gizmos.lib"
!ENDIF
# Begin Target
# Name "gizmos - Win32 Debug"
# Name "gizmos - Win32 Release"
# Name "gizmos - Win32 Unicode Debug"
# Name "gizmos - Win32 Unicode Release"
# Name "gizmos - Win32 Universal Debug"
# Name "gizmos - Win32 Universal Release"
# Name "gizmos - Win32 Universal Unicode Debug"
# Name "gizmos - Win32 Universal Unicode Release"
# Name "gizmos - Win32 DLL Debug"
# Name "gizmos - Win32 DLL Release"
# Name "gizmos - Win32 DLL Unicode Debug"
# Name "gizmos - Win32 DLL Unicode Release"
# Name "gizmos - Win32 DLL Universal Debug"
# Name "gizmos - Win32 DLL Universal Release"
# Name "gizmos - Win32 DLL Universal Unicode Debug"
# Name "gizmos - Win32 DLL Universal Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/gizmos\..\..\..\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/gizmos\dynamicsash.cpp
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\editlbox.cpp
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\ledctrl.cpp
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\multicell.cpp
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\splittree.cpp
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\statpict.cpp
# End Source File
# End Group
# End Target
# End Project

View File

@@ -0,0 +1,16 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "gizmos"=gizmos.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,237 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!ifndef BCCDIR
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gizmosdll.csm
GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_dummy.obj \
$(OBJS)\gizmosdll_dynamicsash.obj \
$(OBJS)\gizmosdll_editlbox.obj \
$(OBJS)\gizmosdll_ledctrl.obj \
$(OBJS)\gizmosdll_multicell.obj \
$(OBJS)\gizmosdll_splittree.obj \
$(OBJS)\gizmosdll_statpict.obj
GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\gizmos\..\..\include $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_gizmoslib.csm
GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_dummy.obj \
$(OBJS)\gizmoslib_dynamicsash.obj \
$(OBJS)\gizmoslib_editlbox.obj \
$(OBJS)\gizmoslib_ledctrl.obj \
$(OBJS)\gizmoslib_multicell.obj \
$(OBJS)\gizmoslib_splittree.obj \
$(OBJS)\gizmoslib_statpict.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = -O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(SHARED)" == "1"
__gizmosdll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__gizmoslib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $**
$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(GIZMOSLIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(GIZMOSLIB_OBJECTS)
|
!endif

View File

@@ -0,0 +1,222 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
$(CXXFLAGS)
GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_dummy.o \
$(OBJS)\gizmosdll_dynamicsash.o \
$(OBJS)\gizmosdll_editlbox.o \
$(OBJS)\gizmosdll_ledctrl.o \
$(OBJS)\gizmosdll_multicell.o \
$(OBJS)\gizmosdll_splittree.o \
$(OBJS)\gizmosdll_statpict.o
GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\gizmos\..\..\include $(CXXFLAGS)
GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_dummy.o \
$(OBJS)\gizmoslib_dynamicsash.o \
$(OBJS)\gizmoslib_editlbox.o \
$(OBJS)\gizmoslib_ledctrl.o \
$(OBJS)\gizmoslib_multicell.o \
$(OBJS)\gizmoslib_splittree.o \
$(OBJS)\gizmoslib_statpict.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g
endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(SHARED),1)
__gizmosdll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__gizmoslib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_editlbox.o: ../../src/gizmos/editlbox.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_ledctrl.o: ../../src/gizmos/ledctrl.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_multicell.o: ../../src/gizmos/multicell.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_editlbox.o: ../../src/gizmos/editlbox.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_ledctrl.o: ../../src/gizmos/ledctrl.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_multicell.o: ../../src/gizmos/multicell.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS)
$(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)
endif
ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a: $(GIZMOSLIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(GIZMOSLIB_OBJECTS)
ranlib $@
endif
.PHONY: all clean

View File

@@ -0,0 +1,298 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\gizmos\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS \
$(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmosdll.pch"
GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_dummy.obj \
$(OBJS)\gizmosdll_dynamicsash.obj \
$(OBJS)\gizmosdll_editlbox.obj \
$(OBJS)\gizmosdll_ledctrl.obj \
$(OBJS)\gizmosdll_multicell.obj \
$(OBJS)\gizmosdll_splittree.obj \
$(OBJS)\gizmosdll_statpict.obj
GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\gizmos\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\gizmos\..\..\include $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_gizmoslib.pch"
GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_dummy.obj \
$(OBJS)\gizmoslib_dynamicsash.obj \
$(OBJS)\gizmoslib_editlbox.obj \
$(OBJS)\gizmoslib_ledctrl.obj \
$(OBJS)\gizmoslib_multicell.obj \
$(OBJS)\gizmoslib_splittree.obj \
$(OBJS)\gizmoslib_statpict.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = /Zi
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_12 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_12 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_12 = $(__DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_11_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_11_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_2_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_2_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
!if "$(SHARED)" == "1"
__gizmosdll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__gizmoslib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(GIZMOSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(GIZMOSLIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(GIZMOSLIB_OBJECTS)
<<
!endif

View File

@@ -0,0 +1,287 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
# Speed up compilation a bit:
!ifdef __LOADDLL__
! loaddll wcc wccd
! loaddll wccaxp wccdaxp
! loaddll wcc386 wccd386
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! loaddll wlink wlink
! loaddll wlib wlibd
!endif
# We need these variables in some bakefile-made rules:
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
__OPTIMIZEFLAG = -ot -ox
!endif
__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
__RUNTIME_LIBS =
!endif
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__gizmosdll___depname =
!ifeq SHARED 1
__gizmosdll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll
!endif
__gizmoslib___depname =
!ifeq SHARED 0
__gizmoslib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!endif
### Variables: ###
GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS &
$(CXXFLAGS) /fh=$(OBJS)\wxprec_gizmosdll.pch
GIZMOSDLL_OBJECTS = &
$(OBJS)\gizmosdll_dummy.obj &
$(OBJS)\gizmosdll_dynamicsash.obj &
$(OBJS)\gizmosdll_editlbox.obj &
$(OBJS)\gizmosdll_ledctrl.obj &
$(OBJS)\gizmosdll_multicell.obj &
$(OBJS)\gizmosdll_splittree.obj &
$(OBJS)\gizmosdll_statpict.obj
GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\gizmos\..\..\include $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_gizmoslib.pch
GIZMOSLIB_OBJECTS = &
$(OBJS)\gizmoslib_dummy.obj &
$(OBJS)\gizmoslib_dynamicsash.obj &
$(OBJS)\gizmoslib_editlbox.obj &
$(OBJS)\gizmoslib_ledctrl.obj &
$(OBJS)\gizmoslib_multicell.obj &
$(OBJS)\gizmoslib_splittree.obj &
$(OBJS)\gizmoslib_statpict.obj
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__gizmosdll___depname) $(__gizmoslib___depname)
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_editlbox.obj : .AUTODEPEND ../../src/gizmos\editlbox.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_ledctrl.obj : .AUTODEPEND ../../src/gizmos\ledctrl.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_multicell.obj : .AUTODEPEND ../../src/gizmos\multicell.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_editlbox.obj : .AUTODEPEND ../../src/gizmos\editlbox.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_ledctrl.obj : .AUTODEPEND ../../src/gizmos\ledctrl.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_multicell.obj : .AUTODEPEND ../../src/gizmos\multicell.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll : $(GIZMOSDLL_OBJECTS)
@%create $(OBJS)\gizmosdll.lbc
@%append $(OBJS)\gizmosdll.lbc option quiet
@%append $(OBJS)\gizmosdll.lbc name $^@
@%append $(OBJS)\gizmosdll.lbc option caseexact
@%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i
@%append $(OBJS)\gizmosdll.lbc
@%append $(OBJS)\gizmosdll.lbc system nt_dll
wlink @$(OBJS)\gizmosdll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +$^@
!endif
!ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib : $(GIZMOSLIB_OBJECTS)
@%create $(OBJS)\gizmoslib.lbc
@for %i in ($(GIZMOSLIB_OBJECTS)) do @%append $(OBJS)\gizmoslib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\gizmoslib.lbc
!endif

View File

@@ -0,0 +1,349 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!ifndef BCCDIR
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
!if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
### Variables: ###
MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_mmediadll.csm
MMEDIADLL_OBJECTS = \
$(OBJS)\mmediadll_dummy.obj \
$(OBJS)\mmediadll_cdwin.obj \
$(OBJS)\mmediadll_sndwin.obj \
$(OBJS)\mmediadll_vidwin.obj \
$(OBJS)\mmediadll_cdbase.obj \
$(OBJS)\mmediadll_g711.obj \
$(OBJS)\mmediadll_g721.obj \
$(OBJS)\mmediadll_g723_24.obj \
$(OBJS)\mmediadll_g723_40.obj \
$(OBJS)\mmediadll_g72x.obj \
$(OBJS)\mmediadll_sndaiff.obj \
$(OBJS)\mmediadll_sndbase.obj \
$(OBJS)\mmediadll_sndcodec.obj \
$(OBJS)\mmediadll_sndcpcm.obj \
$(OBJS)\mmediadll_sndfile.obj \
$(OBJS)\mmediadll_sndg72x.obj \
$(OBJS)\mmediadll_sndmsad.obj \
$(OBJS)\mmediadll_sndpcm.obj \
$(OBJS)\mmediadll_sndulaw.obj \
$(OBJS)\mmediadll_sndwav.obj \
$(OBJS)\mmediadll_vidbase.obj
MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\mmedia\..\..\include $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_mmedialib.csm
MMEDIALIB_OBJECTS = \
$(OBJS)\mmedialib_dummy.obj \
$(OBJS)\mmedialib_cdwin.obj \
$(OBJS)\mmedialib_sndwin.obj \
$(OBJS)\mmedialib_vidwin.obj \
$(OBJS)\mmedialib_cdbase.obj \
$(OBJS)\mmedialib_g711.obj \
$(OBJS)\mmedialib_g721.obj \
$(OBJS)\mmedialib_g723_24.obj \
$(OBJS)\mmedialib_g723_40.obj \
$(OBJS)\mmedialib_g72x.obj \
$(OBJS)\mmedialib_sndaiff.obj \
$(OBJS)\mmedialib_sndbase.obj \
$(OBJS)\mmedialib_sndcodec.obj \
$(OBJS)\mmedialib_sndcpcm.obj \
$(OBJS)\mmedialib_sndfile.obj \
$(OBJS)\mmedialib_sndg72x.obj \
$(OBJS)\mmedialib_sndmsad.obj \
$(OBJS)\mmedialib_sndpcm.obj \
$(OBJS)\mmedialib_sndulaw.obj \
$(OBJS)\mmedialib_sndwav.obj \
$(OBJS)\mmedialib_vidbase.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO = -v-
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = -v
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = -O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(SHARED)" == "1"
__mmediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__mmedialib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__mmediadll___depname) $(__mmedialib___depname)
$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $**
$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) -H $**
$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $@
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib: $(OBJS)\mmedialib_dummy.obj $(MMEDIALIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(MMEDIALIB_OBJECTS)
|
!endif

View File

@@ -0,0 +1,334 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \
$(CXXFLAGS)
MMEDIADLL_OBJECTS = \
$(OBJS)\mmediadll_dummy.o \
$(OBJS)\mmediadll_cdwin.o \
$(OBJS)\mmediadll_sndwin.o \
$(OBJS)\mmediadll_vidwin.o \
$(OBJS)\mmediadll_cdbase.o \
$(OBJS)\mmediadll_g711.o \
$(OBJS)\mmediadll_g721.o \
$(OBJS)\mmediadll_g723_24.o \
$(OBJS)\mmediadll_g723_40.o \
$(OBJS)\mmediadll_g72x.o \
$(OBJS)\mmediadll_sndaiff.o \
$(OBJS)\mmediadll_sndbase.o \
$(OBJS)\mmediadll_sndcodec.o \
$(OBJS)\mmediadll_sndcpcm.o \
$(OBJS)\mmediadll_sndfile.o \
$(OBJS)\mmediadll_sndg72x.o \
$(OBJS)\mmediadll_sndmsad.o \
$(OBJS)\mmediadll_sndpcm.o \
$(OBJS)\mmediadll_sndulaw.o \
$(OBJS)\mmediadll_sndwav.o \
$(OBJS)\mmediadll_vidbase.o
MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\mmedia\..\..\include $(CXXFLAGS)
MMEDIALIB_OBJECTS = \
$(OBJS)\mmedialib_dummy.o \
$(OBJS)\mmedialib_cdwin.o \
$(OBJS)\mmedialib_sndwin.o \
$(OBJS)\mmedialib_vidwin.o \
$(OBJS)\mmedialib_cdbase.o \
$(OBJS)\mmedialib_g711.o \
$(OBJS)\mmedialib_g721.o \
$(OBJS)\mmedialib_g723_24.o \
$(OBJS)\mmedialib_g723_40.o \
$(OBJS)\mmedialib_g72x.o \
$(OBJS)\mmedialib_sndaiff.o \
$(OBJS)\mmedialib_sndbase.o \
$(OBJS)\mmedialib_sndcodec.o \
$(OBJS)\mmedialib_sndcpcm.o \
$(OBJS)\mmedialib_sndfile.o \
$(OBJS)\mmedialib_sndg72x.o \
$(OBJS)\mmedialib_sndmsad.o \
$(OBJS)\mmedialib_sndpcm.o \
$(OBJS)\mmedialib_sndulaw.o \
$(OBJS)\mmedialib_sndwav.o \
$(OBJS)\mmedialib_vidbase.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO = -g
endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(SHARED),1)
__mmediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
endif
ifeq ($(SHARED),0)
__mmedialib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__mmediadll___depname) $(__mmedialib___depname)
$(OBJS)\mmediadll_cdbase.o: ../../src/mmedia/cdbase.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_cdwin.o: ../../src/mmedia/cdwin.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g711.o: ../../src/mmedia/g711.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g721.o: ../../src/mmedia/g721.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_24.o: ../../src/mmedia/g723_24.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_40.o: ../../src/mmedia/g723_40.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g72x.o: ../../src/mmedia/g72x.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndaiff.o: ../../src/mmedia/sndaiff.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndbase.o: ../../src/mmedia/sndbase.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcodec.o: ../../src/mmedia/sndcodec.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndfile.o: ../../src/mmedia/sndfile.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndg72x.o: ../../src/mmedia/sndg72x.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndmsad.o: ../../src/mmedia/sndmsad.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndpcm.o: ../../src/mmedia/sndpcm.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndulaw.o: ../../src/mmedia/sndulaw.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwav.o: ../../src/mmedia/sndwav.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwin.o: ../../src/mmedia/sndwin.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia/vidbase.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidwin.o: ../../src/mmedia/vidwin.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmedialib_cdbase.o: ../../src/mmedia/cdbase.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia/cdwin.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g711.o: ../../src/mmedia/g711.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g721.o: ../../src/mmedia/g721.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_24.o: ../../src/mmedia/g723_24.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_40.o: ../../src/mmedia/g723_40.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g72x.o: ../../src/mmedia/g72x.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndaiff.o: ../../src/mmedia/sndaiff.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndbase.o: ../../src/mmedia/sndbase.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcodec.o: ../../src/mmedia/sndcodec.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndfile.o: ../../src/mmedia/sndfile.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndg72x.o: ../../src/mmedia/sndg72x.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndmsad.o: ../../src/mmedia/sndmsad.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndpcm.o: ../../src/mmedia/sndpcm.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndulaw.o: ../../src/mmedia/sndulaw.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwav.o: ../../src/mmedia/sndwav.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwin.o: ../../src/mmedia/sndwin.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidbase.o: ../../src/mmedia/vidbase.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidwin.o: ../../src/mmedia/vidwin.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS)
$(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a: $(MMEDIALIB_OBJECTS)
if exist $@ del $@
ar rcu $@ $(MMEDIALIB_OBJECTS)
ranlib $@
endif
.PHONY: all clean

View File

@@ -0,0 +1,410 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
MMEDIADLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\mmedia\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\mmedia\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_MMEDIA \
$(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mmediadll.pch"
MMEDIADLL_OBJECTS = \
$(OBJS)\mmediadll_dummy.obj \
$(OBJS)\mmediadll_cdwin.obj \
$(OBJS)\mmediadll_sndwin.obj \
$(OBJS)\mmediadll_vidwin.obj \
$(OBJS)\mmediadll_cdbase.obj \
$(OBJS)\mmediadll_g711.obj \
$(OBJS)\mmediadll_g721.obj \
$(OBJS)\mmediadll_g723_24.obj \
$(OBJS)\mmediadll_g723_40.obj \
$(OBJS)\mmediadll_g72x.obj \
$(OBJS)\mmediadll_sndaiff.obj \
$(OBJS)\mmediadll_sndbase.obj \
$(OBJS)\mmediadll_sndcodec.obj \
$(OBJS)\mmediadll_sndcpcm.obj \
$(OBJS)\mmediadll_sndfile.obj \
$(OBJS)\mmediadll_sndg72x.obj \
$(OBJS)\mmediadll_sndmsad.obj \
$(OBJS)\mmediadll_sndpcm.obj \
$(OBJS)\mmediadll_sndulaw.obj \
$(OBJS)\mmediadll_sndwav.obj \
$(OBJS)\mmediadll_vidbase.obj
MMEDIALIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\mmedia\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\mmedia\..\..\include $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_mmedialib.pch"
MMEDIALIB_OBJECTS = \
$(OBJS)\mmedialib_dummy.obj \
$(OBJS)\mmedialib_cdwin.obj \
$(OBJS)\mmedialib_sndwin.obj \
$(OBJS)\mmedialib_vidwin.obj \
$(OBJS)\mmedialib_cdbase.obj \
$(OBJS)\mmedialib_g711.obj \
$(OBJS)\mmedialib_g721.obj \
$(OBJS)\mmedialib_g723_24.obj \
$(OBJS)\mmedialib_g723_40.obj \
$(OBJS)\mmedialib_g72x.obj \
$(OBJS)\mmedialib_sndaiff.obj \
$(OBJS)\mmedialib_sndbase.obj \
$(OBJS)\mmedialib_sndcodec.obj \
$(OBJS)\mmedialib_sndcpcm.obj \
$(OBJS)\mmedialib_sndfile.obj \
$(OBJS)\mmedialib_sndg72x.obj \
$(OBJS)\mmedialib_sndmsad.obj \
$(OBJS)\mmedialib_sndpcm.obj \
$(OBJS)\mmedialib_sndulaw.obj \
$(OBJS)\mmedialib_sndwav.obj \
$(OBJS)\mmedialib_vidbase.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(OFFICIAL_BUILD)" == "0"
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = d
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = /Zi
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_12 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_12 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_12 = $(__DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
____DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
____DEBUGINFO = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_11_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_11_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_2_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_2_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
!if "$(SHARED)" == "1"
__mmediadll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll
!endif
!if "$(SHARED)" == "0"
__mmedialib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__mmediadll___depname) $(__mmedialib___depname)
$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(MMEDIADLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib: $(OBJS)\mmedialib_dummy.obj $(MMEDIALIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(MMEDIALIB_OBJECTS)
<<
!endif

View File

@@ -0,0 +1,399 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
# Speed up compilation a bit:
!ifdef __LOADDLL__
! loaddll wcc wccd
! loaddll wccaxp wccdaxp
! loaddll wcc386 wccd386
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! loaddll wlink wlink
! loaddll wlib wlibd
!endif
# We need these variables in some bakefile-made rules:
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
__OPTIMIZEFLAG = -ot -ox
!endif
__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
__RUNTIME_LIBS =
!endif
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__mmediadll___depname =
!ifeq SHARED 1
__mmediadll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll
!endif
__mmedialib___depname =
!ifeq SHARED 0
__mmedialib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!endif
### Variables: ###
MMEDIADLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA &
$(CXXFLAGS) /fh=$(OBJS)\wxprec_mmediadll.pch
MMEDIADLL_OBJECTS = &
$(OBJS)\mmediadll_dummy.obj &
$(OBJS)\mmediadll_cdwin.obj &
$(OBJS)\mmediadll_sndwin.obj &
$(OBJS)\mmediadll_vidwin.obj &
$(OBJS)\mmediadll_cdbase.obj &
$(OBJS)\mmediadll_g711.obj &
$(OBJS)\mmediadll_g721.obj &
$(OBJS)\mmediadll_g723_24.obj &
$(OBJS)\mmediadll_g723_40.obj &
$(OBJS)\mmediadll_g72x.obj &
$(OBJS)\mmediadll_sndaiff.obj &
$(OBJS)\mmediadll_sndbase.obj &
$(OBJS)\mmediadll_sndcodec.obj &
$(OBJS)\mmediadll_sndcpcm.obj &
$(OBJS)\mmediadll_sndfile.obj &
$(OBJS)\mmediadll_sndg72x.obj &
$(OBJS)\mmediadll_sndmsad.obj &
$(OBJS)\mmediadll_sndpcm.obj &
$(OBJS)\mmediadll_sndulaw.obj &
$(OBJS)\mmediadll_sndwav.obj &
$(OBJS)\mmediadll_vidbase.obj
MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\mmedia\..\..\include $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_mmedialib.pch
MMEDIALIB_OBJECTS = &
$(OBJS)\mmedialib_dummy.obj &
$(OBJS)\mmedialib_cdwin.obj &
$(OBJS)\mmedialib_sndwin.obj &
$(OBJS)\mmedialib_vidwin.obj &
$(OBJS)\mmedialib_cdbase.obj &
$(OBJS)\mmedialib_g711.obj &
$(OBJS)\mmedialib_g721.obj &
$(OBJS)\mmedialib_g723_24.obj &
$(OBJS)\mmedialib_g723_40.obj &
$(OBJS)\mmedialib_g72x.obj &
$(OBJS)\mmedialib_sndaiff.obj &
$(OBJS)\mmedialib_sndbase.obj &
$(OBJS)\mmedialib_sndcodec.obj &
$(OBJS)\mmedialib_sndcpcm.obj &
$(OBJS)\mmedialib_sndfile.obj &
$(OBJS)\mmedialib_sndg72x.obj &
$(OBJS)\mmedialib_sndmsad.obj &
$(OBJS)\mmedialib_sndpcm.obj &
$(OBJS)\mmedialib_sndulaw.obj &
$(OBJS)\mmedialib_sndwav.obj &
$(OBJS)\mmedialib_vidbase.obj
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__mmediadll___depname) $(__mmedialib___depname)
$(OBJS)\mmediadll_cdbase.obj : .AUTODEPEND ../../src/mmedia\cdbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g711.obj : .AUTODEPEND ../../src/mmedia\g711.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g721.obj : .AUTODEPEND ../../src/mmedia\g721.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_24.obj : .AUTODEPEND ../../src/mmedia\g723_24.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g723_40.obj : .AUTODEPEND ../../src/mmedia\g723_40.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_g72x.obj : .AUTODEPEND ../../src/mmedia\g72x.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndaiff.obj : .AUTODEPEND ../../src/mmedia\sndaiff.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndbase.obj : .AUTODEPEND ../../src/mmedia\sndbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcodec.obj : .AUTODEPEND ../../src/mmedia\sndcodec.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndcpcm.obj : .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndfile.obj : .AUTODEPEND ../../src/mmedia\sndfile.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndg72x.obj : .AUTODEPEND ../../src/mmedia\sndg72x.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndmsad.obj : .AUTODEPEND ../../src/mmedia\sndmsad.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndpcm.obj : .AUTODEPEND ../../src/mmedia\sndpcm.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndulaw.obj : .AUTODEPEND ../../src/mmedia\sndulaw.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_sndwin.obj : .AUTODEPEND ../../src/mmedia\sndwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_vidwin.obj : .AUTODEPEND ../../src/mmedia\vidwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmedialib_cdbase.obj : .AUTODEPEND ../../src/mmedia\cdbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g711.obj : .AUTODEPEND ../../src/mmedia\g711.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g721.obj : .AUTODEPEND ../../src/mmedia\g721.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_24.obj : .AUTODEPEND ../../src/mmedia\g723_24.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g723_40.obj : .AUTODEPEND ../../src/mmedia\g723_40.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_g72x.obj : .AUTODEPEND ../../src/mmedia\g72x.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndaiff.obj : .AUTODEPEND ../../src/mmedia\sndaiff.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndbase.obj : .AUTODEPEND ../../src/mmedia\sndbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcodec.obj : .AUTODEPEND ../../src/mmedia\sndcodec.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndcpcm.obj : .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndfile.obj : .AUTODEPEND ../../src/mmedia\sndfile.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndg72x.obj : .AUTODEPEND ../../src/mmedia\sndg72x.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndmsad.obj : .AUTODEPEND ../../src/mmedia\sndmsad.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndpcm.obj : .AUTODEPEND ../../src/mmedia\sndpcm.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndulaw.obj : .AUTODEPEND ../../src/mmedia\sndulaw.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_sndwin.obj : .AUTODEPEND ../../src/mmedia\sndwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_vidwin.obj : .AUTODEPEND ../../src/mmedia\vidwin.cpp
$(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll : $(MMEDIADLL_OBJECTS)
@%create $(OBJS)\mmediadll.lbc
@%append $(OBJS)\mmediadll.lbc option quiet
@%append $(OBJS)\mmediadll.lbc name $^@
@%append $(OBJS)\mmediadll.lbc option caseexact
@%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\mmediadll.lbc library %i
@%append $(OBJS)\mmediadll.lbc
@%append $(OBJS)\mmediadll.lbc system nt_dll
wlink @$(OBJS)\mmediadll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +$^@
!endif
!ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib : $(MMEDIALIB_OBJECTS)
@%create $(OBJS)\mmedialib.lbc
@for %i in ($(MMEDIALIB_OBJECTS)) do @%append $(OBJS)\mmedialib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\mmedialib.lbc
!endif

View File

@@ -0,0 +1,91 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<if cond="FORMAT=='autoconf'">
<option name="EXTRALIBS_ESD"/>
</if>
<set var="MMEDIA_UNIX_SRC" hints="files">
cdunix.cpp
sndesd.cpp
sndoss.cpp
vidxanm.cpp
</set>
<set var="MMEDIA_WIN32_SRC" hints="files">
cdwin.cpp
sndwin.cpp
vidwin.cpp
</set>
<set var="MMEDIA_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(MMEDIA_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(MMEDIA_WIN32_SRC)</if>
</set>
<set var="MMEDIA_SRC" hints="files">
$(MMEDIA_PLATFORM_SRC)
cdbase.cpp
g711.cpp
g721.cpp
g723_24.cpp
g723_40.cpp
g72x.cpp
sndaiff.cpp
sndbase.cpp
sndcodec.cpp
sndcpcm.cpp
sndfile.cpp
sndg72x.cpp
sndmsad.cpp
sndpcm.cpp
sndulaw.cpp
sndwav.cpp
vidbase.cpp
</set>
<headers template="wx_contrib_headers">
<files>
wx/mmedia/cdbase.h
wx/mmedia/cdunix.h
wx/mmedia/cdwin.h
wx/mmedia/sndaiff.h
wx/mmedia/sndbase.h
wx/mmedia/sndcodec.h
wx/mmedia/sndcpcm.h
wx/mmedia/sndesd.h
wx/mmedia/sndfile.h
wx/mmedia/sndg72x.h
wx/mmedia/sndmsad.h
wx/mmedia/sndoss.h
wx/mmedia/sndpcm.h
wx/mmedia/sndulaw.h
wx/mmedia/sndwav.h
wx/mmedia/sndwin.h
wx/mmedia/vidbase.h
wx/mmedia/vidwin.h
wx/mmedia/vidxanm.h
</files>
</headers>
<dll id="mmediadll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_MMEDIA</define>
<sources>$(MMEDIA_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<ldflags cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldflags>
</dll>
<lib id="mmedialib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(MMEDIA_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmedialib+mmediadll</set>
</makefile>

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