Compare commits

...

4348 Commits

Author SHA1 Message Date
Bryan Petty
9e22785455 This commit was manufactured by cvs2svn to create tag 'wxPy_2_5_1_5'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_5_1_5@26568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 19:48:18 +00:00
Robin Dunn
c7fa61e5ec A clarification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-26 00:22:08 +00:00
Robin Dunn
8f8c4b4045 Moved config.py to the root because if wxPython hasn't been built yet
it can't be imported from wx.build.config since wx._core doesn't
exist.  It is still copied down to wx/build for the install though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-26 00:21:33 +00:00
Robin Dunn
0d575a5dfa Cleanup obsolete samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-26 00:14:31 +00:00
Robin Dunn
1f575e6569 use wxPopupWindow again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-26 00:07:04 +00:00
Václav Slavík
c8fce1a43c fixed tree item size calculation (patch 922454, partially)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 23:01:38 +00:00
Robin Dunn
1128a89b82 The setup.py script will now install wxPython's headers as part of the
standard install.

Moved the bulk of setup.py to wx/build/config.py so 3rd party modules
that wish to use the same setup/configuration code can do so simply by
importing this module form their own setup.py scripts.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 21:36:29 +00:00
David Elliott
c7e61a5ed2 Move m_isShown = false; into base class constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 20:19:36 +00:00
Stefan Csomor
cf6fa9b9ad platform variants for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 19:41:10 +00:00
Stefan Csomor
6b941b35c0 unicode adaption
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 19:30:21 +00:00
Robin Dunn
98bbf4e250 No need to explicitly delete the tbicon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 18:17:22 +00:00
Robin Dunn
45d67f33e0 Added note about wx.TaskbarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 18:16:16 +00:00
Robin Dunn
fa42d1221d cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 18:13:43 +00:00
Robin Dunn
3c076b7aa2 added UpdateSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 18:13:28 +00:00
Julian Smart
7e521b01c3 Added UpdateSize to wxSplitterWindow, to allow an app
to force pane resizing _before_ showing the window.
Added a call to UpdateSize from helpfrm.cpp. Without
this, the flicker is horrible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 13:14:54 +00:00
Jouk Jansen
52a15d5b96 Committing in .
Updates for OpenVMS

 Modified Files:
 	wxWidgets/src/motif/gauge.cpp
 	wxWidgets/src/motif/xmcombo/xmcombo.c
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 06:51:47 +00:00
Robin Dunn
9472490a67 # 17/03/2004 - Joerg "Adi" Sieker adi@sieker.info
# o Added keyboard navigation to the control.
#   Use the cursor keys to navigate through the ages. :)
#   The Home key function as go to today
# o select day is now a filled rect instead of just an outline


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 03:43:21 +00:00
Robin Dunn
fbc46b2046 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 03:39:28 +00:00
Robin Dunn
4f89f6a36b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 02:21:49 +00:00
Robin Dunn
0d267606ff Add GetMaxTotalWidth
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 00:46:55 +00:00
Robin Dunn
bb96dd9306 EVT_SPLITTER_DCLICK alias to match the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 00:46:00 +00:00
Robin Dunn
8179a16812 Fixed OOR typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 00:42:24 +00:00
Robin Dunn
58be4fb131 GetFirstChild does't need the cookie anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-25 00:39:25 +00:00
Robin Dunn
da32eb53cb Changed (again) how the GIL is aquired and the tstate restored. This
time it's simpler, better, and handles the case where there is a wx
calback/event while the GIL has been released by a non-wxPython
extension module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 23:09:59 +00:00
Robin Dunn
70a4ef826f fixed indentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 23:06:52 +00:00
Robin Dunn
0dabb2a2c6 fixes for unicode build, return values from event handlers (via
updated attributes)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 23:06:01 +00:00
Robin Dunn
0bb309f75c copare lower case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 23:02:28 +00:00
Václav Slavík
dda36afd4a fixed warnings about unneeded arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 20:12:14 +00:00
Vadim Zeitlin
eefe6d4b7c don't show the window initially if m_isShown is false, i.e. if Hide() had been called before Create()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-24 14:21:17 +00:00
Václav Slavík
1e6d9c20fd unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when all frames are closed, it must be destroyed explicitly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 23:20:16 +00:00
Václav Slavík
814e9c24c2 use shared samples icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 23:19:30 +00:00
Julian Smart
ae403b112c Applied patch [ 920076 ] [listctrl sample] Keep multiselect menu item in sync
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 22:18:06 +00:00
Julian Smart
e9489c363d Applied patch [ 899676 ] Updated project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 22:14:36 +00:00
Julian Smart
17401ab1cd Applied patch [ 905577 ] Removed copystring from OGL library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 22:07:56 +00:00
Julian Smart
a0086878b0 Applied patch [ 919791 ] [widgets sample] Update wxListbox selection handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 21:58:25 +00:00
Julian Smart
8ad18dc32c Applied [ 899616 ] Fixes to the checklst and splitter samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 21:50:16 +00:00
Julian Smart
46a3848921 Removed redundant wave.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 21:29:20 +00:00
Julian Smart
e0b5519ad9 Applied patch [ 914126 ] Cleaning of the forty demo
Also made configurable between use of grid and canvas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 21:23:17 +00:00
Julian Smart
d8e1aa86f1 Applied patch [ 919026 ] wxBU_EXACTFIT support in wxBitmapButtonXmlHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 20:46:17 +00:00
Julian Smart
e8153940f9 Added wxBU_EXACTFIT support to wxBitmapButton on wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 20:39:57 +00:00
Julian Smart
03ca23b6b7 Misc doc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 20:31:28 +00:00
Stefan Csomor
f973828cd9 classic/carbon split
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 17:48:40 +00:00
Stefan Csomor
52479aefae classic/carbon split
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 17:38:49 +00:00
Stefan Csomor
8cf73271dd classic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 17:35:05 +00:00
Julian Smart
0aff9d91ae Added new icons
Made menus more Mac-friendly


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 08:57:45 +00:00
Robin Dunn
83cbb9e995 Need to navigate to "about:blank" in order for the internal docuemnt
to be created, which has to be done in order for LoadString to work,
so do it at the start.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 06:06:23 +00:00
Robin Dunn
b7c75283f2 Lindsay Mathieson's newest wxActiveX class has been wrapped into a new
extension module called wx.activex.  Lots of demo and lib updates to
go along with it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 05:29:50 +00:00
Robin Dunn
13baae2c95 use default window id
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-23 05:26:02 +00:00
Václav Slavík
a0c9880cd9 marked wxWindows.dsp as deprecated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 22:14:57 +00:00
Václav Slavík
b3c7058ad2 fixed linking (EXTRALIBS_GUI comes after EXTRALIBS and I don't see an easy way to change it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 21:48:27 +00:00
Robin Dunn
1c26fbe00e Ensure the buffer is NULL-terminated before converting it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 18:35:35 +00:00
Robin Dunn
2548474612 Expand the range of WXK_ values that are excluded from OnChar.
Correct the position of the context menu.  (SF# 921247)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 18:22:54 +00:00
Vadim Zeitlin
cbc8c6ee97 moved wxWinHandleHash below wxWindow declaration as otherwise the dtor of forward declared wxWindow is not called inside WX_DECLARE_HASH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 18:06:23 +00:00
Vadim Zeitlin
cf9df19136 removed wxMotif::wxMenuItem::DeleteSubMenu()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 17:47:50 +00:00
Vadim Zeitlin
e0ae1a0ae9 auto detect the icon if none given instead of asserting (MSW and Mac do allow this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 17:42:49 +00:00
Václav Slavík
238fb020fa compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 12:53:37 +00:00
Vadim Zeitlin
2bc8663422 update from Ylia K
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 11:07:18 +00:00
Vadim Zeitlin
ff79234425 distinguish between main keyboard and numeric enter keys (fixes 902095)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-21 23:13:50 +00:00
Václav Slavík
5b2b456fb1 lists rendering fixes (second part of patch 911377)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-21 10:37:21 +00:00
Václav Slavík
d49520c318 a) navigation panel needs size hint, reverted previous revision; b) added wxADJUST_MINSIZE for tree and list controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-21 09:31:29 +00:00
Václav Slavík
d80f251586 removed any possibility of confusion regarding Bakefiles.local.bkgen format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 23:23:50 +00:00
Robert Roebling
74707d69ca Applied SetItemData() patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 16:21:19 +00:00
Vadim Zeitlin
a4e0917b48 compilation fix for the last wxSprintf() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 13:44:06 +00:00
Robert Roebling
c077ee9433 Applied notebook font patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:57:46 +00:00
Vadim Zeitlin
03b3965c3a why should wxMessageDialog dialog have another m_parent, in addition to wxWindow::m_parent? removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:51:35 +00:00
Vadim Zeitlin
1840af0319 reuse existing wxGetTopLevelParent() function in wxMessageDialog ctor instead of reimplementing it (yes, it is just 4 lines, but this still was enough for a fatal bug to slip in them...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:49:43 +00:00
Vadim Zeitlin
27005f3a3f explicitly return NFR_UNICODE from WM_NOTIFYFORMAT when using MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:45:26 +00:00
Vadim Zeitlin
9a63feff3a added wxSetCCUnicodeFormat() and use it in wxTreeCtrl/wxToolBar; also replaced SendMessage(LVM_SETUNICODEFORMAT) with a call to it in wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:39:04 +00:00
Robert Roebling
7aad0bf32e i
Allow NULL parent in message dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:28:12 +00:00
Robert Roebling
aa154cb157 Fix conversion error in tooltips.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:24:16 +00:00
Stefan Csomor
2646f48516 split classic and carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 07:43:01 +00:00
Vadim Zeitlin
f8991003ff fixed wxSnprintf() for Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 22:45:18 +00:00
Julian Smart
6f7105b65e Implemented borderless wxTextCtrl (wxNO_BORDER)
If this inteferes with other patches we can revert and apply later


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 21:12:01 +00:00
Stefan Neis
5ae0b1dbcd Fixed bogus line break.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 16:33:04 +00:00
Jouk Jansen
a371f70393 Committing in .
wxX11 for OpenVMS (phase 3)
   -minimal.exe for OpenVMS now builds and displays a window but crashes when
    trying to use the menus.

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/include/wx/vms_x_fix.h
 	wxWidgets/lib/VMS_X11_UNIV.OPT
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/univ/descrip.mms wxWidgets/src/x11/app.cpp
 	wxWidgets/src/x11/descrip.mms wxWidgets/src/x11/font.cpp
 	wxWidgets/src/x11/gsockx11.cpp wxWidgets/src/x11/utilsx.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 15:48:03 +00:00
Julian Smart
7b3daa84ac Wizard sets default button when displaying new page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 12:22:53 +00:00
Julian Smart
6dc863c78f When a directory can't accessed, don't assert, return false
from wxDir and give a suppressable error message. This fixes
problems reading e.g. .vol directories.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 10:34:15 +00:00
Jouk Jansen
fdc37e95b3 Committing in .
Enabling wxX11 for OpenVMS (Phase 2)
    -partly redo and fix for prevous commit

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/display.h
 	wxWidgets/src/common/dpycmn.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 08:53:09 +00:00
Julian Smart
bfff68e8b4 Reduced margin in Mac wxNotebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 08:28:33 +00:00
Jouk Jansen
1aebc20057 Committing in .
Enabling wxX11 for OpenVMS (phase 1)

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/include/wx/display.h
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/common/dpycmn.cpp
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/html/descrip.mms wxWidgets/src/univ/descrip.mms
 	wxWidgets/src/unix/descrip.mms wxWidgets/src/x11/descrip.mms
 Added Files:
 	wxWidgets/lib/VMS_X11_UNIV.OPT
 Removed Files:
 	wxWidgets/lib/vms_gtk_univ.opt
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-19 08:04:29 +00:00
Václav Slavík
2a92d7e50f WXUSINGDLL is defined when building samples on non-MSW platforms for simplicity, corrected check for it to affect Win32 only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 23:12:58 +00:00
Robin Dunn
f1860ca765 Some dot-files need copied to the tarball
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 22:27:00 +00:00
Robin Dunn
b69d3db804 Correct file format errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 22:26:00 +00:00
Robin Dunn
312cca179a Got rid of the BIN dir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 22:05:24 +00:00
Robin Dunn
b2bacf13e3 demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 22:04:08 +00:00
Julian Smart
29dfc56bf4 Remove size hints for now that messes up nav panel size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 21:41:52 +00:00
Robin Dunn
d4a376ac6c added tinkalink2.wav, as a binary file this time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 21:18:12 +00:00
Robin Dunn
d0bcee7af0 removed so it can get added back flagged as a binary file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 21:10:26 +00:00
Robin Dunn
03975ed492 removed some sample sounds, added another.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 20:43:46 +00:00
Robin Dunn
2626810054 Restored part of the default positioning code for dialogs that I
removed a few days ago.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 19:02:01 +00:00
Václav Slavík
86c5779a6f compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 17:24:06 +00:00
Robin Dunn
aa063b2408 Fix compile errors with VC 6. Untabified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 17:23:31 +00:00
Stefan Csomor
6db1f43b6c corrected delete operator for array
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 13:57:03 +00:00
Vadim Zeitlin
25c71cccb5 fixes for warnings about implicit double -> int conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 11:16:29 +00:00
Stefan Neis
17b35e1d64 Untabified.
Quick hack to allow compilation, deleting threads is broken for now, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 10:54:24 +00:00
Stefan Neis
33689859bb Reverted setting WS_VISIBLE to 0, too many undesired side effects.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 10:49:58 +00:00
Vadim Zeitlin
9c63cc9daa added auto4mte.cache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 09:51:23 +00:00
Robin Dunn
99abd512ae More agressive cleanup. Now also removes temp items that are created
by setup.py, not just by the rest of distutils.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-18 00:46:08 +00:00
Václav Slavík
7e6f48d18c we need to output \r\n on MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 22:51:41 +00:00
Václav Slavík
c5448f38d7 <div> handling fix (Xavier Nodet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 22:44:32 +00:00
Vadim Zeitlin
ea8f6fc718 initialize m_initialized to false to avoid spurious asserts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 22:20:42 +00:00
Václav Slavík
ca16b7a98e improved HTML tables layout code (patch 911377)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 20:47:31 +00:00
Robin Dunn
d43699ef11 change default style to match
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 20:07:41 +00:00
Robin Dunn
e83135b283 __version__.py is now always generated from setup.py so there is no
need to have it in src any more.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 19:57:06 +00:00
Robin Dunn
4e0b6696c7 Add GetPyData and SetPyData aliases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 19:55:00 +00:00
Václav Slavík
d638e2fc75 don't add \n, it's supposed to be part of the input
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 11:53:14 +00:00
Robert Roebling
58d185f709 Applied wheel mouse patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 09:42:04 +00:00
Julian Smart
0082709429 Now does cleanup when returning false from OnInit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 08:13:21 +00:00
Robin Dunn
c0831a3c31 Implement wxBitmapButton::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 22:17:07 +00:00
Robin Dunn
c046274e38 implment wxBitmapButton::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 21:58:53 +00:00
Robin Dunn
178a12204b implement wxBitmapButton::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 21:58:27 +00:00
Vadim Zeitlin
cc3dd6fce9 really fixed calling isspace() for non-ASCII characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 21:48:18 +00:00
Robert Roebling
119cd34193 This should fix a link error in GTK 2.3.X and
it is the right thing to do anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 21:30:06 +00:00
Robert Roebling
c0d0a5520e Added missing "break;".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 19:07:33 +00:00
Jouk Jansen
3a36944181 Committing in .
Update OpenVMS compile support

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 15:24:33 +00:00
Václav Slavík
e194780eb0 wx-config didn't include WXUSINGDLL on Mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 13:28:35 +00:00
Václav Slavík
efe6c06ffc --static flag docs correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 13:18:54 +00:00
Robert Roebling
abb492ba03 Allow non-toplevel-window to given as the
parent of a message dialog (as it is done
   in the controls sample).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 11:54:45 +00:00
Stefan Csomor
b7ce141fd1 set scrollbarsize back to normal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 06:47:47 +00:00
Ron Lee
45b7f8192e Enable wxUSE_DISPLAY by default. It is required for wxPython builds now
and doesn't seem obviously harmful to anyone else.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 01:45:39 +00:00
Vadim Zeitlin
85c09802c0 don't change the font by reinitializing it to XLFD which was found to match it in GetInternalFont()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 23:29:19 +00:00
Robin Dunn
622a19f0ea Don't bind events to the return value of SetDefault, D'oh!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 23:09:55 +00:00
Robin Dunn
d6b5679f31 Fiddling with the resize a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 23:09:18 +00:00
Robin Dunn
da65a43959 write selection info to the log
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 23:08:27 +00:00
Robin Dunn
6a8fa617f1 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:57:03 +00:00
Robin Dunn
2e55c8189d Set focus back to the tree after loading the new sample pages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:56:15 +00:00
Robin Dunn
5c66e6508d Removed the text about the default window sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:54:15 +00:00
Robin Dunn
09b77fb711 Fix GBSpan and GBPosition typemaps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:47:25 +00:00
Robert Roebling
c7d6d88330 Comitted GTK part of clipboard patch, that
enables non-unicode strings to be seen in
    Unicode apps. This is relevant since KDE
    apps paste non-Unicode text.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:46:48 +00:00
Robin Dunn
c19bd0a37a Also add a bool() function if running on a too old Python.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:46:30 +00:00
Robin Dunn
8b7fa2d969 Give BitmapButton its own demo, get rid of ErrorDialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:45:00 +00:00
Robin Dunn
4261ba88cf Use the length when converting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 22:43:30 +00:00
Robin Dunn
72a1118475 MSWGetCreateWindowCoords is already setting CW_USEDEFAULT as needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 21:34:27 +00:00
Robert Roebling
6d9713540d New menu code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 20:19:20 +00:00
Patrick K. O'Brien
d40bbd4dac Eliminate relative imports and make them more py2exe friendly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 13:42:37 +00:00
Ron Lee
a7716111cb Added missing autoconf_inc.m4 to dist target,
configure.in is useless without it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 03:56:21 +00:00
Patrick K. O'Brien
f65958ccce Changed default shell.autoCompleteAutoHide to False.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 02:30:07 +00:00
Ron Lee
616d1b3cb0 Last minute changes to fix 2.5.1.1 debs for release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-14 14:02:04 +00:00
Robin Dunn
e6c3fa1bb0 Use the WidthDefault and HeightDefault in wxTLW, not wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 21:35:58 +00:00
Robin Dunn
5c2be659f9 Fixed comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 20:42:58 +00:00
Robin Dunn
66202a7ee6 I keep running into situations where the old small default window size
was expected, and odd initial layouts resulted, so let's leave only
TLWs at the new 400x250 default size, and give all other windows the
old 20x20 default.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 20:41:09 +00:00
Robin Dunn
92094b0950 Need an additional #include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 17:45:04 +00:00
Robert Roebling
eef4e26cd3 Gradient fill splitter window sash. This won't
look good in brushed metal theme..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 16:47:22 +00:00
Vadim Zeitlin
3c9642b54d fixed debug assert in VC 7.1 CRT due to calling isalnum() with 8bit chars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 12:14:37 +00:00
Robin Dunn
8027eb22c6 More doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 06:14:56 +00:00
Robin Dunn
e2f7f0625d fiddle with the configure flags a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 06:10:26 +00:00
Robin Dunn
55b602db52 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 01:56:46 +00:00
Robin Dunn
b42b447cf4 Reorganized the contents of the disk image. Only the Installer
package and a README-1st are at the top level, the docs, apps,
etc. are in subdirs.

Include the main wxDocs in the disk image too, in a form that the
viewer can be launched just by running a wxPython app.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 01:56:23 +00:00
Robin Dunn
0f69b6a94d Added OSX instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-13 00:16:22 +00:00
Vadim Zeitlin
94672b3a4b removed dcbuffer.cpp; replaced wave.cpp with sound.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 23:59:30 +00:00
Robin Dunn
b39e211bbb regenerated metadata
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 23:38:09 +00:00
Robin Dunn
7409c0c61f reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 23:30:22 +00:00
Julian Smart
8da2ab9900 Fixed multiline static texts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 21:44:48 +00:00
Robin Dunn
951aa70eb4 distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:17:22 +00:00
Robin Dunn
21b227f211 fixed a failure message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:16:01 +00:00
Robin Dunn
52868a7577 aliases for SizerInfo.[Get|Set]Option, since I just mentioned them in
the maillist...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:04:26 +00:00
Robin Dunn
de51258f70 Tweaks needed to get pySketch to work with 2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:03:37 +00:00
Robin Dunn
fc33e5e1f0 Regenerated the HTML versions of the ReST docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:02:39 +00:00
Robin Dunn
ce32c85b26 Added note about new default window sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:01:35 +00:00
Robin Dunn
15eac935e8 Added a document describing the steps that need to be taken to do a
full wxPython build for distribution.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 20:01:07 +00:00
Robin Dunn
6e83b721d9 Some distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 19:59:50 +00:00
Robin Dunn
dc4b282d2f Fix for too big default window size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-12 19:46:56 +00:00
Vadim Zeitlin
97247d366d fixed race conditions resulting in infinite OutputDebugStrings() and program freezes when wxDialUpManager was created and destroiyed immediately (bug 896806)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 23:32:53 +00:00
Robin Dunn
7f997e3f0e Add --with-sdl to the build doc and RPM spec
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 22:45:35 +00:00
Robin Dunn
391ddf408d Some themes round the edges of the buttons, overwriting any text that
goes all the way to the edges.  Give the button a few extra pixels to
work around that.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 22:44:36 +00:00
Vadim Zeitlin
67c4abe329 update from Janos Vegh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 21:52:26 +00:00
Robin Dunn
aa92c39880 Changed the sound sample to allow the user to choose a wav file to
work with, and also added some additional test wav files of various
sampling rates, sample sizes and channels.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 19:31:33 +00:00
Robin Dunn
544c4a3bde Changed the OSS backend to detect if the DSP requires a conversion of
the sampling data in order to play it.  Currently it fails if this is
the case but in the future a conversion could be done, or it could
fall-back to another backend that is able to handle it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 19:29:34 +00:00
Václav Slavík
3209f765e9 try SDL backend before OSS, it works better (temporary solution, will need better fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 16:40:44 +00:00
Robin Dunn
20ed8fab85 Use PlatformInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 06:30:10 +00:00
Robin Dunn
4c41721418 Fix how the contribs include dir is added to the list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 06:28:07 +00:00
Robin Dunn
330af86940 Allow the stdout redirection to be toggled on or off in the demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-11 06:26:54 +00:00
Robin Dunn
dd346b947b Added wx.PlatformInfo which is a tuple containing strings that
describe the platform and build options of wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 18:53:01 +00:00
David Webster
fd92852491 Need to ensure WXEXPORT and WXIMPORT are not defined for EMX or INNOTEK builds when compiling with WXMAKINGDLL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 16:38:00 +00:00
Robin Dunn
803a0ba6b6 Try using a regular mask on wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 07:01:52 +00:00
Robin Dunn
8e43747f62 wishful thinking... :-(
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 06:56:57 +00:00
Robin Dunn
8a88769e50 Add demo showing drawing of an image with an Alpha channel.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 06:52:36 +00:00
Robin Dunn
fe76311545 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 04:16:12 +00:00
Robin Dunn
ce7284bd97 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 04:10:27 +00:00
Robin Dunn
c6c4892942 build doc update for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 04:07:53 +00:00
Robin Dunn
a5d9c77bb8 demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 04:04:52 +00:00
Robin Dunn
4276dc529d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 03:36:04 +00:00
Robin Dunn
26eac43ed1 Allow wxApp::MacOpenFile, MacPrintFile, MacNewFile, and MacReopenApp
to be overridden in Python.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 03:19:51 +00:00
Robin Dunn
ec656cfe29 add --enable-display
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 03:16:48 +00:00
Robin Dunn
defa74be6d Add display.[cpp|h] for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 03:14:47 +00:00
Robin Dunn
54313f9ce0 doc fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 02:07:02 +00:00
Robin Dunn
85e7fb12b0 Don't log StretchDIBits failures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 02:06:01 +00:00
Robin Dunn
e0269b2e2a Added __nonzero__ for wxTraskBarIcon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 02:04:21 +00:00
Robin Dunn
da457c1b49 wxMac can do wxMetaFileDC now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 02:02:24 +00:00
Robin Dunn
d88d4683f3 PrintFramework fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 01:19:08 +00:00
Robin Dunn
610926ab51 We need a file when printing to the printer too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 01:18:15 +00:00
Robin Dunn
1111cedc6a TLWs can use the WidthDefault and HeightDefault methods too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 01:17:22 +00:00
Robin Dunn
3a12cb0a94 Give wxGauge a best size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 01:15:30 +00:00
Stefan Neis
b6db2e9107 C++ comments transformed to C comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 22:48:53 +00:00
Stefan Neis
60848fcfef Fixed some problems in converting existing static libs into DLLs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 22:34:28 +00:00
Václav Slavík
bd5e3a811e docs correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 22:30:08 +00:00
Robin Dunn
bb5919e4df Use wxPyRaiseNotImplemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 22:03:33 +00:00
Robin Dunn
96d37ab547 Added wxDisplay and wxVideoMode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 22:01:29 +00:00
Stefan Neis
c6e801d3e6 Link against import libraries of DLLs when building DLLs.
Enforce 8.3 names for wxWindows DLLs - make install is going to need fixing...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 21:53:07 +00:00
Stefan Neis
3cceb09b36 Support --enable-omf on OS/2 _only_.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 12:55:48 +00:00
Robin Dunn
9470921fbb Need to use the same instance handles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-09 02:17:23 +00:00
Robin Dunn
ed666328da Use EDIT_HEIGHT_FROM_CHAR_HEIGHT until something better can be done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 23:28:31 +00:00
Robin Dunn
8d332bddb1 Added [G|S]etWindowVariant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 23:18:26 +00:00
Robin Dunn
b403cd6583 Added equality operators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 23:16:59 +00:00
Robin Dunn
69d818954b default style for statusbars varies by platform
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 23:16:10 +00:00
Robin Dunn
b887061dd1 Updated version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 23:15:12 +00:00
Julian Smart
2e3b8fa75a Fixes for handle change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 20:01:04 +00:00
Stefan Neis
49299ddc41 Use unified unix/gsocket.c on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 13:17:59 +00:00
Stefan Neis
f3d8619423 main() is now always in the program.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 13:01:21 +00:00
Stefan Neis
bed67b7f86 Don't use global wxBuffer from code that gets compiled into the wx_base*.dll.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 11:29:15 +00:00
Stefan Neis
11a20c3a78 Support for building DLLs on OS/2 (using dllar.sh).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 10:17:55 +00:00
Stefan Neis
2d35020a8d Shell version of dllar, needed for building DLLs while generating
.def file on the fly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 09:50:27 +00:00
Václav Slavík
8f8e45c4d9 removed more unneeded files, see patch 890642
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-08 09:41:41 +00:00
Dimitri Schoolwerth
20fa338c41 Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returned with FILLCOLORHINT, retry with FILLCOLOR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 20:00:28 +00:00
Julian Smart
73bb677607 Improved wxTreeCtrl tooltip processing performance (causing
major delays in processing button clicks)
Added wxFULL_REPAINT_ON_RESIZE as default for wxStatusBar
on wxGTK since otherwise there are display problems.
Similarly for wxGrid.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 17:28:36 +00:00
Robert Roebling
4f85606724 Added wxToggleBitmapButton (it compiles).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 16:46:36 +00:00
Stefan Csomor
8471ea9033 fix for always terminating intermediate UniChar String for 4 bytes wchar_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 16:45:38 +00:00
Stefan Neis
8ed42a0688 Added OMF support for OS/2 (no support for DLLs, yet).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 15:57:46 +00:00
Julian Smart
87ff599d25 Don't refresh statusbar field if the text is identical
(removes flicker)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 15:22:28 +00:00
Stefan Csomor
4227afa4f7 byte length for interim UniChar String corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 14:54:21 +00:00
Stefan Csomor
da3f3e049a header includes for mac corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 14:49:56 +00:00
Stefan Csomor
daf6ac9f8a header includes corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 12:43:23 +00:00
Stefan Csomor
69d90995bb SetWindowVariant implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 12:42:37 +00:00
Václav Slavík
2367247b6c *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:59:08 +00:00
Ron Lee
5259a4179c Remove demos from the Debian -examples package.
Replace html lib in tex2rtf build, it is needed for any platform
where wxHelpController == wxHtmlHelpController.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:45:10 +00:00
Václav Slavík
30bb5e18ac removed unneeded makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:37:09 +00:00
Václav Slavík
d7204bba1d small fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:34:18 +00:00
Stefan Csomor
7688f0a1f7 unicode fix and header includes corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 06:03:54 +00:00
Stefan Csomor
7f0c3a63a0 OS Header includes corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 06:01:53 +00:00
Václav Slavík
7d5ab151a5 wxFormatConverter test rewritten for CppUnit (patch #910051)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 11:23:49 +00:00
Robin Dunn
4d2962b127 ShouldInheritColours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:16:00 +00:00
Robin Dunn
601c78c6b6 Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:15:15 +00:00
Robin Dunn
cefae4bc3c New style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:14:50 +00:00
Robin Dunn
86aafce32e Updated DrawPolyPolygon note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:14:11 +00:00
Robin Dunn
77c7f5c930 Default stule for wxFileConfig
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:12:53 +00:00
Robin Dunn
c26dba42b7 Decided that not doing methods for keyboard commands was not worth the
effort keeping track of which should be eliminated and which should
not.  Now all functions defined in Scintilla.iface will have a method
in the wxSTC class.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-06 00:09:07 +00:00
Robin Dunn
31e36465d0 Add the wx module to the namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:57:45 +00:00
Robin Dunn
71ed12a01e Only close the shell window if it still exists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:38:39 +00:00
Robin Dunn
980f458f7f Remove some extra Refreshes and such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:37:36 +00:00
Robin Dunn
979fdc00c6 Use WidthDefault and HeightDefault
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:36:20 +00:00
Václav Slavík
0f21699216 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:14:57 +00:00
Václav Slavík
e70833fb1d added regex test suite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:14:23 +00:00
Václav Slavík
99e839da3c moved to tests/regex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:13:58 +00:00
Václav Slavík
14ffa74318 minor corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 23:13:22 +00:00
Václav Slavík
cf677716c0 CppUnit compilation fixes for win compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 22:55:21 +00:00
Robin Dunn
5d2ad05582 wxGTK2 sends *only* wxEVT_SCROLLWIN_THUMBTRACK (why?) so
wxVScrolledWindow needs to respond to it otherwise nothing happens
when using the scrollbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 22:27:49 +00:00
Robin Dunn
426936d182 Change wxMSW to use WidthDefault and HeightDefault for window sizes,
like the other platforms do.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 21:17:06 +00:00
Robin Dunn
723f8e3a33 Updated comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 21:16:28 +00:00
Robin Dunn
a7c26d107d Changed WidthDefault() and HeightDefault() to use 400,250. If there
is a better set of default values feel free to change it, just don't
make them too small for TLWs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 21:04:10 +00:00
Robin Dunn
fffd96b769 MaskedEditCtrl updates from Will Sadkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 20:58:16 +00:00
Robin Dunn
64ff2615ae Remove #!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 20:57:15 +00:00
Ron Lee
b63b07a809 More updates to the Debian packaging for wxPython, unicode and
the project name change.

Applied patch from ABX to make tex2rtf unicode compatible, then
removed wxSprintf lameness from it so it might actually work.
Also modified it to return true from tex2rtf OnInit in console
builds so the app will exit with a successful return code rather
than always returning failure even when it succeeds.

Implemented unicode capable wxCtime for glibc systems also needed
by tex2rtf.

Wrapped dde include in tex2rtf in a guard and assert that dde is
MSW only in its forwarding header.

Lowered the limit of maxlen in wxSprintf so it actually has a
chance to segfault on people instead of failing silently and
mysteriously with glibc.

Silenced some other 'potentially uninitialised variable' warnings
from gcc3, most of which were bogus, one potentially not so.

Added missing newline at the end of fontdlg.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 17:40:38 +00:00
Vadim Zeitlin
a0af0d98b5 don't lose fonts underlined flag in ReInit() (bug fix for the change in rev. 1.76)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 14:09:36 +00:00
Václav Slavík
b8e7f410db wxHTML not used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 13:49:25 +00:00
Václav Slavík
eca1e6a0cc always define wxUSE_MOUSEWHEEL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 10:54:04 +00:00
Robin Dunn
cc0bffaceb Changed CanApplyParentThemeBackground to ApplyParentThemeBackground
and let the windows set the the background colour themselves (or not)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 05:28:21 +00:00
Robin Dunn
8eca4fef10 When running samples from the demo standalone you can now add a
--shell to the command line and it will start a PyShell to go with it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 00:06:33 +00:00
Robin Dunn
4395fb21f6 Delay checking for the requested sash position until the first
OnInternalIdle after it is set.

TRUE/FALSE --> true/false

Fixed a bug that allowed the sash cursor to be shown the the pointer
is not quite on the sash yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 23:48:41 +00:00
Julian Smart
95c1ea29ed WinCE project and wxDC corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 23:16:47 +00:00
Robin Dunn
80c700cba9 Use wxWANTS_CHARS style so cursor keys can be used on wxMSW, send
wxNavigationKeyEvents on MSW since WANTS_CHARS will block those, and
inherit font and colors like wxListBox does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 18:39:08 +00:00
Robin Dunn
bd507486e0 Added CanApplyParentThemeBackground and use it in wxMSW's
wxNotebook::ApplyThemeBackground.  It's in the common base classes so
that someday it's usage can expand to the other platforms as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 17:03:55 +00:00
Stefan Csomor
a6de86fa53 support for wxUSE_PALETTE = 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 16:16:58 +00:00
David Webster
884215788f Remove the Innotek for OS/2 addition...configure now deals with this correctly on it's own
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 14:33:20 +00:00
David Webster
31bb37a246 Remove the Innotek for OS/2 addition...configure now deals with this correctly on it's own
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 14:25:04 +00:00
Jouk Jansen
57b4050c83 Committing in .
change OpenVMS compile support from wxWindows to wxWidgets

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/lib/vms.opt wxWidgets/lib/vms_gtk.opt
 	wxWidgets/lib/vms_gtk_univ.opt
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 09:39:24 +00:00
Stefan Csomor
d223107206 placeholder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 07:27:42 +00:00
Stefan Csomor
bcce8f754f fix for late redraw messages in a already destroyed window hierarchy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 07:18:36 +00:00
Stefan Neis
e7d70ef0e3 Fixed error in moving code from app.cpp in evtloop.cpp - caused accelerator
handling to be broken, now fixed again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 00:16:56 +00:00
Robin Dunn
327b382e1e Put version numbers back to 2.5.1 until 2.5.2 is imminent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:40:24 +00:00
Václav Slavík
abf07807b4 no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:12:54 +00:00
Václav Slavík
943e6c56ac regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:07:52 +00:00
Vadim Zeitlin
fa2d17ac25 use global file/regkey by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:04:04 +00:00
Vadim Zeitlin
9a85c87d32 fixed bug with not reading settings from HKLM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:02:26 +00:00
Vadim Zeitlin
bee96abfbc added AccessMode parameter to wxRegKey
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 23:01:05 +00:00
Václav Slavík
670ec35765 applied path 906264: test program
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 22:56:16 +00:00
Václav Slavík
98eae46601 compilation fix for unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 22:53:52 +00:00
Vadim Zeitlin
3e1bf71c36 do check for <iostream> even when cross-compiling -- why not?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 22:16:32 +00:00
Vadim Zeitlin
4e86e9cd19 added wxMenuBar::GetLabelTop() fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 22:14:25 +00:00
Mattia Barbon
d0b0287895 Add missing file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 21:05:18 +00:00
Mattia Barbon
2a23a89dec Removed duplicated code.
wxTranslateXXXEvent must not alter the XEvent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 21:03:13 +00:00
Mattia Barbon
088ab98499 Calculate length explicitly (for wxUSE_STL == 1).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 20:59:24 +00:00
Julian Smart
3c2544bb70 Added wxSP_NO_XP_THEME style to wxSplitterWindow to switch off
theming (some applications look bad without 3D borders)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 20:44:37 +00:00
Julian Smart
5088af155b Changed some version numbers to 2.5.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 20:38:09 +00:00
Robin Dunn
6d7dec7bfc Copy all needed files for the debian source dist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 20:08:16 +00:00
Robin Dunn
39ad2bfe5c Copy all needed files for the debian source dist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 19:06:39 +00:00
Stefan Csomor
48de597b73 API adaptions to MSW EnhMetafile, fixes and extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 14:47:55 +00:00
Julian Smart
7ba6220216 Only scale an image once, which vastly improves the appearance
of scaled images in print and preview


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 14:20:13 +00:00
Stefan Csomor
35c40e78c6 API adaptions to MSW EnhMetafile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 14:10:04 +00:00
Julian Smart
29402f455b Allow an app to call SetFont on a PS DC without assertion
(should be possible to use SetFont before StartDoc).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 13:32:24 +00:00
Stefan Csomor
21956470c7 safe destruction, even if redraws might be triggered
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 10:47:57 +00:00
Chris Elliott
b2247ee93b final part of SF patch #904166 (DMC fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 10:46:59 +00:00
Stefan Csomor
6898822480 casting for CW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 09:39:51 +00:00
Stefan Csomor
d206654397 tentative fix for http://sourceforge.net/tracker/index.php?func=detail&aid=908712&group_id=9863&atid=109863
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 09:39:02 +00:00
Stefan Csomor
f3a355ceb3 added conversions via UniChar for wchar = 4 bytes versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 09:24:02 +00:00
Stefan Csomor
604b66c10b added comment about array, switched intepretation of IsRunning to MSW meaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 07:17:32 +00:00
Ron Lee
e1293dcf96 Updates for debian build scripts to suit new library and tool status.
Updated config.{sub,guess} for new platform support.
Incorporated fixes to GNU/Hurd support and added GNU/K*BSD support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 07:10:36 +00:00
David Webster
7047ddc0cf Innotek gcc for os2 specific updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 06:38:41 +00:00
David Elliott
593b256f33 Construct wxCocoaNSWindow with a pointer to this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 03:45:38 +00:00
David Elliott
0092ef0d53 s/wxTopLevelWindow/wxTopLevelWindowCocoa/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 03:44:20 +00:00
David Elliott
7a8691eec8 Constructor now takes a wxTopLevelWindow * = NULL so that the new
GetWxTopLevelWindow() method can be used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 03:35:06 +00:00
Robin Dunn
fb89cfc537 Fix for [ 907679 ] segfault on SetSizerAndFit after SetSizer
Don't do anything if setting the same sizer again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 02:06:09 +00:00
Robin Dunn
d19a83a5ac Added a typemap that converts the references returned for some GDI
objects (Brush, Pen, Font, etc.) into copies, (taking advantage of the
copy-on-write capabilities of the C++ class.)  This is to work around
an issue where getting a GDI object changing it and setting it back to
the DC would trigger an incorrect optimization.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 02:02:28 +00:00
Robin Dunn
36c8c4718a fixed some docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 01:59:49 +00:00
Robin Dunn
96577d6d7a Fixed wxWindow_FromHWND so it would compile (still untested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 01:57:10 +00:00
Robin Dunn
a5deb2fbe7 Fixed some wx prefix issues, changed the self test to use a sizer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 01:50:39 +00:00
Robin Dunn
2d112dc2a3 Removed some test code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:54:02 +00:00
Robin Dunn
1f443284e1 Updates for STCStyleEditor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:51:23 +00:00
Robin Dunn
51ba037fa8 copy the metadata file into the docs archive too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:50:39 +00:00
Robin Dunn
e8a71fa08c Namechange changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:49:39 +00:00
Robin Dunn
2f4ad68c32 Docstring tweaks, fixed typo, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:47:24 +00:00
Robin Dunn
6e7db3c845 Added InReportView
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:46:38 +00:00
Robin Dunn
11f0bb6988 Docstring tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:45:47 +00:00
Robin Dunn
6606583981 Fixed wx.Timer to not need to hold an extra reference to itself, so it
can be cleaned up properly when the Python reference to it is
released.  Also fixed wx.FutureCall so that its timer can be
restarted.  Souped up the Timer demo to show and explain the various
ways to use a wx.Timer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:44:42 +00:00
Václav Slavík
a5441ce3a5 return version of GTK+ library the app links against, not the one it was compiled with
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 23:36:07 +00:00
David Elliott
cf83f7c617 Removed unncessary includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 20:48:57 +00:00
Vadim Zeitlin
a1037371af wxWindow::Freeze()/Thaw() can now be nested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 18:15:00 +00:00
Vadim Zeitlin
c040ce40a2 updated VC build instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 18:00:38 +00:00
David Elliott
205fef01e0 Implement wxMenuItemAction and validateMenuItem delegate virtuals
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 13:58:54 +00:00
Chris Elliott
fb21f36d92 part of SF patch #904166 (DMC fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 11:03:07 +00:00
Chris Elliott
8183307507 part of SF patch #904166 (DMC fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 09:28:32 +00:00
Chris Elliott
edff734975 apply SF patch #907546 (DMC fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 09:15:24 +00:00
David Elliott
522e2aa861 SendDestroyEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 05:26:57 +00:00
David Webster
357b66eb5b Unused variable removed from inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 04:27:54 +00:00
Robin Dunn
17256d1ed0 Trim trailing spaces from key names when parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-02 02:41:25 +00:00
Robert Roebling
75a22e8106 Only when wxTE-PROCESS_ENTER has been set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 23:31:16 +00:00
Robert Roebling
4a11cca24d Spin control now emits TEXT_ENTER commands.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 23:28:50 +00:00
Robert Roebling
16dce3b37b Applied patch for generic file dialog Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 22:54:20 +00:00
Robert Roebling
055e633de6 Make multi-line text control focussable
by using tabs under GTK 2.0.
  Make hitting ENTER in a wxSpinCtrl to
    activate the default button work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 22:42:07 +00:00
Robert Roebling
ae7cbd1a1f Made space around text symmetric.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 22:17:56 +00:00
Mattia Barbon
000a825371 Remove deprecated copystring() usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 21:48:05 +00:00
Vadim Zeitlin
68cb648117 mention Win9x size limitation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 20:54:59 +00:00
David Webster
9923c37dcc Warning suppressions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-01 06:24:20 +00:00
Vadim Zeitlin
52d9d823a1 check for NULL pointer returned by wxFontEnumerator::GetFacenames() (it actually happens under Cocoa and could conceivably happen elsewhere as well...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 23:54:46 +00:00
Vadim Zeitlin
793db75554 renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 23:34:01 +00:00
Vadim Zeitlin
163dc80eff docs and example for wxDC::DrawPolyPolygon() (patch 882189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 23:31:02 +00:00
Vadim Zeitlin
b5d43d1d73 use HasFlag() and InXXX() instead of explicit flag testing (patch 899507)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 23:24:35 +00:00
Václav Slavík
496f0a58b1 compilation fix for wxUSE_FILESYSTEM=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 22:30:39 +00:00
Vadim Zeitlin
c5e2dc6f5b removed erroneous return type from a membersection (patch 905562)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 22:26:40 +00:00
Vadim Zeitlin
1ad6d522ed honour the 2nd parameter of DeleteEntry() instead of always deleting empty groups unconditionally (patch 896303)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 22:25:28 +00:00
Vadim Zeitlin
c79ba234fa update from Jonas for 2.5.1 (patch 901921)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 22:17:08 +00:00
Mattia Barbon
e4f3eb42f2 Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 15:21:11 +00:00
Mattia Barbon
4b5e5cfb22 Added wxRTTI information to wxNumberEntryDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 15:18:21 +00:00
Mattia Barbon
9c592b6165 STL fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 15:15:59 +00:00
Mattia Barbon
08938fe1b5 The DND sample shows both clipboard and drag'n'drop functionality,
as such it can work with just wxUSE_CLIPBOARD.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 15:14:24 +00:00
Julian Smart
6b707fc394 Specify tree control in event table to avoid problems with stray tree events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 13:05:20 +00:00
Julian Smart
04bf08b7e2 Some doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-29 13:02:01 +00:00
Václav Slavík
ced5554416 fixed wxDebugContext to work with global and static objects (patch 901031)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 23:57:54 +00:00
Václav Slavík
121680bff0 reverted rev 1.26, workarounds for memchecking code no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 23:57:15 +00:00
Václav Slavík
b598205862 another cleanup of constraints code in samples (patch #906438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 21:13:00 +00:00
Stefan Neis
90c86c0ca3 Compilation fix for Innotek gcc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 19:19:44 +00:00
Václav Slavík
32ddf007a2 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 17:59:07 +00:00
Stefan Neis
463b12b830 Compilation fix for OS/2 specific "Innotek gcc" port.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 17:43:23 +00:00
Stefan Neis
dc4118b883 Configuration fixes for OS/2 specific "Innotek gcc" port.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 17:28:05 +00:00
Stefan Neis
3c221c5088 Compilation fix for OS/2 specific "Innotek gcc" port.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 17:23:22 +00:00
Robert Roebling
0f87e84cc6 GPE generic font dialogs change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 15:32:41 +00:00
Robert Roebling
0f6792ad22 Add generix font dialog to gtk build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 15:27:58 +00:00
Robert Roebling
47e118ba9a GPE uses generic dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 15:27:11 +00:00
Robert Roebling
62be94e1b1 make use of GPE feature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 13:18:08 +00:00
Robert Roebling
16bd311d28 Checks for --enable-gpe, libgpewidget
defines __WXGPE__


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 13:16:30 +00:00
Václav Slavík
9230b62136 applied patch to remove use of deprecated constraints API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 10:46:36 +00:00
Václav Slavík
eac98de747 copy data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 09:56:52 +00:00
Robin Dunn
cb2d8b773c Typos fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 23:22:47 +00:00
Robin Dunn
b25cb7db43 Updated wx.lib.calendar with many fixes and enhancements from Joerg
"Adi" Sieker.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 23:21:37 +00:00
Vadim Zeitlin
527bbb3997 mention exit code change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 18:09:08 +00:00
Vadim Zeitlin
bc37bb431f documented OnRun()/OnExit() return values; expanded OnInit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 17:10:38 +00:00
Václav Slavík
ec59d2ccea fixed typoe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 16:56:52 +00:00
Stefan Csomor
b93f383244 since drawtext does not have to take linefeeds into account, they're #if 0'ed now. fix for background colors in text using classic quickdraw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 10:07:24 +00:00
David Elliott
7dd8b1ea10 Make wxMenuItemAction: and validateMenuItem: delegate messages take an
NSWindow* parameter instead of an id.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 06:07:47 +00:00
Robin Dunn
9c329f86c6 Updated html files, removed old simplify xsl and shell script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 00:34:30 +00:00
Robin Dunn
dd35b09a3b distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 00:30:47 +00:00
Vadim Zeitlin
118208ac3b fix showing toolbar tooltips (we were using a pointer to a temporary object so it mostly _appeared_ to work but really didn't)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 00:24:13 +00:00
Vadim Zeitlin
fdf1429eea testing wxComboBox::SetBackgroundColour()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-27 00:02:44 +00:00
Robin Dunn
a8f47d21d5 distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 23:51:59 +00:00
Robin Dunn
c2dda88254 updated metadata file with new docstrings and such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 23:29:50 +00:00
Robin Dunn
99aca60e76 distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 23:28:24 +00:00
Robin Dunn
2f4c0a1618 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 22:23:53 +00:00
Vadim Zeitlin
06d4e3c226 AddPendingEvent() is not virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 22:21:52 +00:00
Václav Slavík
c76b647492 fixed invalid memory read
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 21:49:54 +00:00
Vadim Zeitlin
a4b4366304 update from Petri Jooste
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 21:35:53 +00:00
Robin Dunn
15afbcd000 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 21:29:56 +00:00
Robin Dunn
f4e088f7bb Fix compilation error due to recent typedef changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 21:14:29 +00:00
Robin Dunn
a0c956e8e6 Fix compilation errors due to recent typedef changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 21:12:16 +00:00
Robin Dunn
56ca5a419b ContextHelp is fixed on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 20:49:22 +00:00
Robin Dunn
fda1446558 Don't use AA fonts to avoide measurment problem on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 20:43:47 +00:00
Robin Dunn
e2bbfc8f05 docstring tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:50:35 +00:00
Robin Dunn
0facd0e524 Added docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:38:21 +00:00
Robin Dunn
d7466b1d18 Fixed PyDropTarget rename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:37:41 +00:00
Robin Dunn
014577f340 Fix a typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:34:26 +00:00
Robin Dunn
01f44840c5 Call event.Skip in OnSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:33:48 +00:00
Robin Dunn
947697fbd0 copy the style sheet too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 19:33:02 +00:00
Stefan Csomor
634bafa9eb attempt to tame composite data objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 17:02:00 +00:00
David Webster
53ac3021de Bad update last night. Compiler error fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 14:57:18 +00:00
Stefan Csomor
2dd35daad1 Pending() fixed for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 11:01:54 +00:00
Stefan Csomor
09322209d8 adjusted LB_EXTENDED and LB_MULTIPLE to wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 07:52:17 +00:00
Stefan Csomor
9f2bfce7b2 fixed crash when no wx menubar is created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 07:28:25 +00:00
Stefan Csomor
b635e17fef reverting best size calculations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-26 07:09:13 +00:00
David Webster
eb65cb341b Updated depricated stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 23:25:04 +00:00
David Webster
258f5b3ec3 Updated depricated stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 23:03:46 +00:00
Stefan Neis
ddefbe7ff2 Fixed various types like e.g. WXHWND for OS/2 that have been broken
by the previous update.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 21:49:52 +00:00
Julian Smart
c140b7e7c9 Applied patch [ 903619 ] Win64 and Itanium support
by Brian Palmer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 10:45:02 +00:00
Julian Smart
52f52ebc4e Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 10:39:57 +00:00
Václav Slavík
9c266fa066 newer DigitalMars is required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 09:57:18 +00:00
Robin Dunn
1cee36ad05 Oops!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 01:39:25 +00:00
Robin Dunn
4c42683a5c Added docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 00:42:30 +00:00
Robin Dunn
cf636c4555 Corrected dependency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-24 02:44:10 +00:00
Robin Dunn
861d483291 Added docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-24 02:09:17 +00:00
Robin Dunn
f659339e93 AddFile isn't just for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-24 02:08:38 +00:00
Robin Dunn
b4f1aaad5d Some more demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-24 02:01:04 +00:00
Václav Slavík
632783de61 create wxPrintData instance on demand
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 22:38:30 +00:00
Robin Dunn
9513c5b609 The UseAntiAliasing is off by default on wxMac. Add a menu item to
the Py* Apps for experimenting with it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 22:36:24 +00:00
Robin Dunn
0eaf23edfa Turn off UseAntiAliasing by default on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 22:10:19 +00:00
Robin Dunn
08b89fa868 Can't use NameError to check for NotIMplemented anymore. Just
explicitly check platforms until I figure out a better way to do it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 21:23:26 +00:00
Robin Dunn
b3badadcfc Can do wx.ToggleButton on wxMac now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 21:22:09 +00:00
Robin Dunn
10c7746bcc Build tglbtn.cpp and install tglbtn.h on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 21:05:04 +00:00
Robin Dunn
643dcb7ab5 Use a regular ID for the menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 20:22:14 +00:00
Julian Smart
97c2479c31 Was missing glcanvas.cpp/h copy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 14:12:36 +00:00
Julian Smart
f9d5648a95 Fix for compilation under GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 22:04:22 +00:00
Václav Slavík
2ded391d8f added reference to the bug in case somebody wanted to remove this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 21:05:54 +00:00
Julian Smart
97c0ea03b3 Fixed file lists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 19:03:05 +00:00
Robert Roebling
48fbb5214d I don't understand what the original author
of the current list ctrl header button code
    under Mac meant with "CORNER", but the whole
    thing is off by 1.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 18:12:13 +00:00
Robert Roebling
65a1f3509b The list ctrl doesn't draw any focus
item under Mac at all.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 18:10:24 +00:00
Robert Roebling
71628a57aa Upported menu bitmaps from 2.4.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 17:29:34 +00:00
Robert Roebling
ff1c71a24f Small correction to radio box look.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 17:28:25 +00:00
Robert Roebling
b3bd912def Don't hide the last TLW immediately as this
will prevent any idle events from coming
    anywhere and the last TLW we stay there
    as a ghost.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 16:40:40 +00:00
Robert Roebling
91fdca5b17 Draw bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 14:30:14 +00:00
Robert Roebling
c14e964847 MacOS Carbon now has a toggle button.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 12:58:50 +00:00
Robert Roebling
d7f1759ac1 Commit mentioned fix/hack to enable controls
inside a notebook to calculate the right size.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 11:51:23 +00:00
Robert Roebling
b7b7dedc1f Fixed some probs in wxRadioBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 11:50:09 +00:00
Julian Smart
6e084216cf Tweaks for WinHelp RTF - a few spacing problems remain
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 11:29:39 +00:00
Julian Smart
4c7848f1e4 Tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 01:25:51 +00:00
Julian Smart
6144c7c305 Added tex2rtf doc targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 01:18:14 +00:00
Julian Smart
d2c2afc91b Doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 01:16:32 +00:00
Julian Smart
40126b09cc Largely successful attempts to get better spacing
in RTF. This may temporarily break WinHelp RTF but the priority
right now is Word RTF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 23:37:01 +00:00
Stefan Neis
9457cf684e Removed zipped-up version of OS/2-specific configure files (no longer needed).
Moved precompiled resourced from said zip-File to include/wx/os2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 22:36:59 +00:00
Robin Dunn
1a31cb0ae3 Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 19:21:26 +00:00
Robin Dunn
8d87b3e77f Use the standard wxBufferedDC again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 19:20:46 +00:00
Robin Dunn
7775e41fd7 Restored old wxBufferedDC functionality until it can be decided how to
correct the current issues without making things worse.  Updated docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 19:09:59 +00:00
Stefan Csomor
5c45e86bac workaround for blocking behaviour under carbon when running in classic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 18:11:14 +00:00
Stefan Csomor
7c4a8e4107 missing headers for non mach
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 18:10:07 +00:00
Julian Smart
f4728e4f5b Updated CW project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 17:04:21 +00:00
Stefan Csomor
ea969303f8 mwerks addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 16:39:22 +00:00
Stefan Csomor
eabe6af8d9 implementation for mac added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 16:38:23 +00:00
Stefan Csomor
407f0db050 using Large System font for Buttons needs more space
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 16:35:24 +00:00
Julian Smart
024e0f6981 Ok tests pixmap and bitmap now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 14:50:13 +00:00
Julian Smart
c92ddcd2e1 Some doc spacing fixes; removed references to
deprecated classes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 09:06:36 +00:00
Robin Dunn
3a0a61b066 New SWIG runtime files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 03:26:31 +00:00
Robin Dunn
38f591599b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 02:18:17 +00:00
Robin Dunn
37f9912de4 Fix compile error on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 02:17:23 +00:00
Robin Dunn
328fcd84d4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 02:04:26 +00:00
Robin Dunn
b88bce5f07 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:58:17 +00:00
Robin Dunn
6ad421ae90 Added docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:54:41 +00:00
Robin Dunn
ef22e3d35e Use a local copy of the old wxBufferedDC classes until the ones in the
C++ library are fixed again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:53:46 +00:00
Robin Dunn
d11c3d6484 Fixed a couple typos and such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:53:02 +00:00
Robin Dunn
f04ad14aa1 Updated the AnalogClockWindow with many enhancements from from
E. A. Tacão.




git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:52:33 +00:00
Robin Dunn
a27d1f42e2 Big fixes. Can now use colour names, and exports the event type to
the old namespace


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-21 01:51:41 +00:00
Robert Roebling
5ce61d9fd2 Don't do toolbar and menu UI updates if
the owning frame or TLW is about to
    get deleted anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 22:32:00 +00:00
Robert Roebling
b6b579bd14 Give font 12pt size if none is given in pango string.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 22:30:17 +00:00
Robert Roebling
47a3ff38a3 Scrolling pages works not under GTK2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 22:27:50 +00:00
Václav Slavík
f45f5d2726 updated new regex lib information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 18:29:29 +00:00
Julian Smart
d3c17ee7a2 Additions to changes.txt
Doc corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 17:04:39 +00:00
David Elliott
86adc75813 Implement wxMenuItemAction: and validateMenuItem: delegate messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 02:55:28 +00:00
Robin Dunn
e498079eb4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 01:27:16 +00:00
Robin Dunn
e5868095fe Added docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 01:26:07 +00:00
Robert Roebling
fe5d86ed04 Don't update toolbar UI if the parent will
get destroyed later anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 23:13:01 +00:00
Robin Dunn
c0b15381d1 Since this class is fully inline don't specify an import/export policy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 23:11:48 +00:00
Robin Dunn
7a0b15e94a Reverted wxBufferedDC changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 20:42:00 +00:00
Václav Slavík
18430b7b78 win32 doesn't treat ' as quotes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 19:58:49 +00:00
Václav Slavík
b92ca8cf62 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 19:36:30 +00:00
Robert Roebling
a333f34d91 Compile fix for sound without threads. Not sure
if that is the optimal fix.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 19:17:59 +00:00
Václav Slavík
1dc049cc34 fixed syntax errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 19:03:50 +00:00
Václav Slavík
0aa7fa9afd applied patch 890642: wxRE_ADVANCED flag and docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 18:02:48 +00:00
Václav Slavík
4996f26121 applied patch 890642: wxRE_ADVANCED flag and docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 17:50:01 +00:00
Václav Slavík
e3f9e20cb1 applied patch 890642: wxRE_ADVANCED flag and docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 17:28:56 +00:00
Ron Lee
b4e2cbb515 Removed dcbuffer.cpp, its implementation is all inline now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 17:23:23 +00:00
Václav Slavík
1701c4d421 applied patch 890642: wxRE_ADVANCED flag and docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 16:57:15 +00:00
Václav Slavík
3ca4086b22 reverted to TCL version of regex library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 16:47:02 +00:00
Julian Smart
bf25c88b6a GetSubcontrols now const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 15:26:03 +00:00
Julian Smart
ada88e3efe Remove crash due to reference being kept after object destroyed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 15:04:54 +00:00
Julian Smart
f093ce07ec Removed obsolete file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 14:06:47 +00:00
Patrick K. O'Brien
a47c63ba51 Changed default namespace of Shell to __main__.__dict__, instead of an
empty dictionary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 13:53:20 +00:00
David Elliott
c6f73d05cc Use one wxNSWindowDelegate instance per wxCocoaNSWindow instance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 06:32:34 +00:00
Ron Lee
dbd22c6a0e Removed the SaveBG hack. The real incompatibility is that the MemoryDC
is not automatically cleared to the BG colour of the window when a
temporary bitmap is used.

Inlined the rest of the methods, there really is no reason for them not
to be.  (will remove dcbuffer.cpp as soon as I figure out the bakefiles)

Do device to logical transforms in UnMask.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 06:23:01 +00:00
Stefan Csomor
ee65839881 correct boundaries for carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 05:32:09 +00:00
Robin Dunn
22faec7d06 Allow comparrisons with None
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 02:33:28 +00:00
Dimitri Schoolwerth
112ae51d19 Made finding the bakefile related tech note easier.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 00:34:53 +00:00
Dimitri Schoolwerth
3f6bd7c1c5 wxCleanup; Added accelerators for navigation (Alt+left, Alt+right).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 00:24:06 +00:00
Julian Smart
1aa81b1712 Removed warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 17:24:12 +00:00
Julian Smart
89607008b5 VC++ correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 16:21:27 +00:00
Julian Smart
2fe827d0b9 Applied [ 897450 ] Patch for WXDEBUG_NEW docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 11:44:11 +00:00
Julian Smart
7161de858f Added wxDIALOG_NO_PARENT style to XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 09:35:46 +00:00
Robin Dunn
b409bb30c7 fixed a compile warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 02:23:01 +00:00
Robin Dunn
1f05e33b7d reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 02:17:35 +00:00
Robin Dunn
fcafa8a99e Added some more docstrings, and also a few little tweaks along the way.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-18 02:12:12 +00:00
Dimitri Schoolwerth
d1b3039b9f Fixed typo causing multiple file selections to always return the same single name.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 18:11:16 +00:00
Robin Dunn
e608d2285c corrected %addtofunc for BufferedDC constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 16:00:03 +00:00
Julian Smart
09f27917fb Fixed a bug in DoGetBestSize that would make wxSpinCtrl too tall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 14:44:22 +00:00
Václav Slavík
243f8ae50a regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 11:53:01 +00:00
Julian Smart
1cc0bc109a Tweaked the WinCE readme
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 11:19:41 +00:00
Julian Smart
d61c1a6f21 Fixed source for WinCE compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 10:06:26 +00:00
Dimitri Schoolwerth
2eb85fe466 Fixed invalid background colour of controls on a notebookpage when using certain XP themes/WindowBlinds skins (bug 897965).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 04:21:41 +00:00
Dimitri Schoolwerth
fadb227e01 Implemented wxExecute (minimal flags support).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 03:41:25 +00:00
Dimitri Schoolwerth
1904aa72f0 Fixed compilation for !wxUSE_IMAGE as well as !wxUSE_TOOLBAR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 23:27:54 +00:00
Dimitri Schoolwerth
05e4fd64c4 Added config checks for wxUSE_IMAGE = 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 23:24:23 +00:00
Robert Roebling
f8b043e78f Added better visual feedback for tree control
triangles. They now have a sort of prelight
    status like they have under GTK2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 23:12:33 +00:00
Dimitri Schoolwerth
67e489c5cf Removed c++ style comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 22:38:43 +00:00
Dimitri Schoolwerth
f517634c46 Included required wx/image.h and added wxUSE_IMAGE guard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 21:35:54 +00:00
Dimitri Schoolwerth
b126fe3ae2 Fixed unreferenced function 'CutEmptyBorders' warning (MSVC6).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 20:57:17 +00:00
Vadim Zeitlin
a96b8d39fb fixed IsOk() for root directory paths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 18:30:18 +00:00
Julian Smart
a4411ee220 Added instructions for running Applescript scripts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 17:41:58 +00:00
David Elliott
42352409bc Remove superfluous call to CocoaRemoveFromParent (it's done in ~wxWindow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-16 03:40:26 +00:00
Dimitri Schoolwerth
08158721a1 Cosmetic cleanup (TRUE/FALSE, tabs, ...).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 21:56:40 +00:00
Dimitri Schoolwerth
25c46fda57 Extended maximum tooltip length (in non-Unicode comctl32 4.70+ mode) from (MSW limited) 39 chars to 512 chars (customizable).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 21:38:22 +00:00
Vadim Zeitlin
5c2ddebecd use correct way to get a pointer to vector elements in DoGetPartialTextExtents()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 19:12:54 +00:00
Robert Roebling
3d78043440 Fix warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 18:38:36 +00:00
Stefan Neis
d37bb826ef Added accelerator handling for buttons and infrastructure to do the same for
other controls (patch 893580).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 18:00:27 +00:00
Stefan Neis
3a7c125370 Fixed separator handling for menus.
Extracted common code for handling translation of labels containing
        accelerators from wxWindows representation to native representation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 17:33:26 +00:00
Vadim Zeitlin
eeacbb8c4f removed unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 16:56:15 +00:00
Vadim Zeitlin
13dd924a3f fail WC2MB conversion in wxCSConv if we can't be sure that we don't lose information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 15:44:07 +00:00
Vadim Zeitlin
4f09729dfb added tech note about writing unit tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 15:43:42 +00:00
Vadim Zeitlin
2cc0718168 added (draft of) a unit test for wxMBConv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 15:43:21 +00:00
Robert Roebling
ca06ee0df7 wxGPE updates to HEAD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 15:31:39 +00:00
Stefan Neis
31414f4c19 Do a configure test whether or not to include -I/usr/local/include in
wx-config --c*flags instead of never doing it for gcc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 14:14:03 +00:00
Stefan Neis
a36036203f Do _not_ test for strcasecmp on OS/2 (where stricmp is the function to be used).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 14:09:59 +00:00
Robert Roebling
16c587ca76 This should work on SuSE and Mandrake icon themes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 13:15:50 +00:00
Robert Roebling
1027433607 Slightly less hacky way to get the KDE icon theme name.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 12:57:23 +00:00
Robert Roebling
7dfdce6b02 This allows white space to be in the name
of a key (as KDE ini files allow it).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 12:55:35 +00:00
Vadim Zeitlin
86132a69bc added wrapper header for CppUnit headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 02:58:56 +00:00
Vadim Zeitlin
e2473d4c48 include stdlib.h to get malloc/free decl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 02:57:43 +00:00
David Elliott
c3255f5fba Bakefile 0.1.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 02:14:15 +00:00
Robert Roebling
1d529ef7ee Updates to MIME-types and wxFileDialog code for better
native looking image handling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 00:35:16 +00:00
Robert Roebling
6d7184953a InitAsNeeded no longer inline in the header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 00:32:45 +00:00
Robert Roebling
a96f1024e3 Updated exefile and default file icons to newer look.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 00:31:47 +00:00
Robert Roebling
013e1feecd The file dialog needs to be able to read images (mostly PNG).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 00:30:44 +00:00
Julian Smart
38106243a0 Now sends an exit command to the app so Quit behaves as it should
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 23:19:53 +00:00
Mattia Barbon
c539731c41 Updated italian translation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 14:25:14 +00:00
Vadim Zeitlin
8280918daf don't truncate filenames by default (why?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 11:35:26 +00:00
Stefan Csomor
d8c5974799 corrected system condition for panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 05:22:14 +00:00
Robin Dunn
f32fc4bc1b Oops, used the wrong script to generate the metadata...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 03:24:18 +00:00
Robin Dunn
98e665d3b0 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 03:17:53 +00:00
Robin Dunn
856bf319b5 Added some docstrings.
Added wx.DefaultDateTime.
Fixed CalendarCtrl.HitTest


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 03:11:36 +00:00
Dimitri Schoolwerth
78ca56690e Simplified OS X Panther detection code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 02:40:59 +00:00
Robin Dunn
04ebdf400c Oops, took out too much...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 02:29:01 +00:00
Robin Dunn
d13ea3aa4f Fix the off-by-one a little differently, and correct a refresh problem
on wxMac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 02:22:03 +00:00
Robin Dunn
0fcf2b15da Fixed an off-by-one error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 23:05:20 +00:00
Vadim Zeitlin
f567fcfadc DMC compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 22:33:02 +00:00
Robin Dunn
c3eb6258e8 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 21:30:56 +00:00
Robin Dunn
1b35fec738 Gave wxWindow.GetHandle something to do on wxMac, although it won't
have exactly the same meaning as the other platforms.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 20:24:47 +00:00
Robin Dunn
33adb15261 Fixed a compile error on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 20:23:40 +00:00
Robin Dunn
0ffb2aa6e4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 20:23:25 +00:00
Robin Dunn
8492b560bf Add some ownerdraw methods to ListBox for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 20:21:47 +00:00
Robin Dunn
0482c494d3 Make all wxMask constructors use the C++ (bitmap, colour) ctor, and
then just default in BLACK to simulate the default (monobitmap)
behaviour.  It's too tricky to make true monochome bitmaps in a
platform independent way from the Python wrappers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 20:09:55 +00:00
Robin Dunn
ccc6783c50 Tweaks for when using some new tex2rtf options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 19:07:41 +00:00
Robin Dunn
11926a7837 Typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 19:06:55 +00:00
Robin Dunn
b6bfd8e8f4 Call Skip from the focus handlers so wxGTK can still do it's internal housekeeping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 19:06:02 +00:00
Patrick K. O'Brien
6513628384 Fix test broken by change in package name from PyCrust to py.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 02:52:06 +00:00
Patrick K. O'Brien
578b389d6e The truth is out there.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 02:47:59 +00:00
Vadim Zeitlin
b62e750df9 added /usr/lib and lib32 to SEARCH_LIB (trying to fix IRIX compilation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 00:03:46 +00:00
Václav Slavík
6f97a409ca added description of environment variables that affect wxWin programs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 22:50:18 +00:00
Václav Slavík
e6a0295cdd fixed bug in .hhp's FILES section creation introduced in previous revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 20:13:28 +00:00
Julian Smart
439e20bb71 DMC doesn't have #warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 19:47:58 +00:00
Robin Dunn
3795cdba1b Fixed to use wxNcPaintEvent types where needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 19:45:40 +00:00
Václav Slavík
66828481aa don't use numbers in URLs if truncateFilenames=no
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 19:29:48 +00:00
Julian Smart
51b62c2431 Some more string concatenations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 19:19:29 +00:00
Vadim Zeitlin
b2b1371c97 set argc/argv properly in Unicode build (fixes bug 878002)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 18:42:39 +00:00
Vadim Zeitlin
6819fb9bef don't override GetSize(), this doesn't work (bug 732758)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 18:19:12 +00:00
Vadim Zeitlin
1c2d1459e9 hopefully fixed strings.h mess completely now by not including it unless really needed (should fix bug 689456)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 18:10:33 +00:00
Vadim Zeitlin
6341d8249f fix yet another assert when the initial combo box value was empty (replaces patch 895470)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 16:45:28 +00:00
Vadim Zeitlin
15475ced88 suppress triple clicks generation completely for GTK2 as it makes long click series generate exactly the same events as under other ports (patch 895564)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 16:41:59 +00:00
Vadim Zeitlin
dc631754fc added Select() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 16:35:36 +00:00
Vadim Zeitlin
5e7718a281 corrected wxTreeCtrl::Select() broken by previously applied patch in single select mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 16:33:33 +00:00
Julian Smart
bdbcded6a3 String corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 13:29:55 +00:00
Julian Smart
a0d924c696 Infinite recursion fix
Viktor Voroshylo:
I did not put it in __WXWINCE__ defines as it looks like just another safeguard that will work on regular windows as well. The problem was that wxWindowMSW::MSWOnScroll is calling itself forever under winCE for wxListCtrl object.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 09:29:19 +00:00
Stefan Csomor
89a69c601d patch applied for clearing m_data object upon closing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 07:16:44 +00:00
Robin Dunn
88f226fa98 A little tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 02:22:42 +00:00
Robin Dunn
db91459553 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:39:33 +00:00
Robin Dunn
927d7cfa70 Added selection methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:34:37 +00:00
Robin Dunn
4cc5453b83 PS can output to ta stream (but still need to make output streams more
usable from wxPython...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:34:00 +00:00
Robin Dunn
04e271558d Fix ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:32:03 +00:00
Robin Dunn
746ee6b82c Added wxDC::GetPartialTextExtents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:14:15 +00:00
Robin Dunn
a3a2c5fec0 HYBRID wxPython builds also need the __NO_VC_CRTDBG__ define since
there are wx headers that use it now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:13:20 +00:00
Vadim Zeitlin
7330bb53dc compilation fix for strict(er) compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:04:38 +00:00
Vadim Zeitlin
f943802348 define DWORD_PTR &c for Win32 compilation whatever headers we use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:02:41 +00:00
Vadim Zeitlin
fe16045d95 compilation fix (PASCAL should be inside the parenthesis in typedef declaration)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 01:00:38 +00:00
Robin Dunn
553aa032f2 Added wxDC::GetPartialTextExtents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-12 00:25:49 +00:00
Robin Dunn
0919e93e52 Added wxDC:GetPartialTextExtents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 23:49:43 +00:00
Robin Dunn
42bf070c7e Added wxDC::GetPartialTextExtents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 23:49:31 +00:00
Robin Dunn
d1558f3d53 Use extraFontFlag to specify if anti-aliased fonts should be used.
Use GetPartialTextExtents.


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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


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


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


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


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


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


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

Julian: Fix this the right way.


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


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


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


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


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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

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


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


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

2.
Changed search text cntrl to a multiline one


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

2.
Handle GRETA compilations errors


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

2.
Match/Compile time


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


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


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


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


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

2.
Added regextest sample


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


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


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


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


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

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


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


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


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


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

2.
Cosmetics


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

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

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

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

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

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


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


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


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


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


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

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


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

2.
No longer wxUSE_NEW_REGEX, just wxUSE_UNICODE

3.
Various changes concerning #2

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


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


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


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


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


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

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


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

Started adding extra docstrings where needed.

Some other little tweaks and fixes.


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


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


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


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


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


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


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


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


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


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


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


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

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


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


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


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


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

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


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


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


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


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


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


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


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


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


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


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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


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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

View File

@@ -23,6 +23,18 @@ linux-gnu.system.cache
*.swo
Release
Debug
ReleaseUnicode
DebugUnicode
ReleaseUnicodeARM
DebugUnicodeARM
ReleaseUnicodeMIPS
DebugUnicodeMIPS
ReleaseUnicodeSH3
DebugUnicodeSH3
ReleaseUnicodeX86
DebugUnicodeX86
ReleaseUnicodeX86EM
DebugUnicodeX86EM
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
@@ -36,11 +48,9 @@ BaseDebugDLL
robert
stamp-h.in
Makefile
configure
setup.h
stamp-h
libtool
aclocal.m4
base
gtk
gtk2
@@ -62,3 +72,4 @@ win32-release
log
univtags.cmd
.DS_Store
autom4te.cache

View File

@@ -12,9 +12,8 @@ a) If using Microsoft Visual C++ 5.0 or 6.0
Ensure that the command-line compiler and tools (including
nmake) are installed and ready to run. Depending on your
installation there may be a batch file (named something like
VCVARS32.BAT) that needs to be run to set correct environment
varaibles and PATH entries.
installation there may be a batch file (commonly named VCVARS32.BAT)
that needs to be run to set correct environment variables and PATH entries.
Continue with item c) below.
@@ -23,54 +22,62 @@ b) If using the MinGW or Cygwin compilers
You can get MinGW from http://www.mingw.org/
Cygwin is available at http://sources.redhat.com/cygwin/
Cygwin is available at http://www.cygwin.com/
The makefile might have small problems with Cygwin's tools
so it is recommended to use MinGW 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 MinGW 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 MinGW 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 MinGW) or 0 (you have Cygwin).
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
-> Assumming that you installed the wxWindows sources
into c:\wxWin
-> Copy c:\wxWin\include\wx\msw\setup0.h
to c:\wxWin\include\wx\msw\setup.h
-> Edit c:\wxWin\include\wx\msw\setup.h to choose
Assumming that you installed the wxWindows sources
into c:\wxWindows:
-> Copy c:\wxWindows\include\wx\msw\setup0.h
to c:\wxWindows\include\wx\msw\setup.h
-> Edit c:\wxWindows\include\wx\msw\setup.h to choose
the features you would like to compile wxWindows with[out].
and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0
-> type: cd c:\wxWin\src\msw
-> type: set WXWIN=c:\wxWin
-> type: make -f makefile.g95 (if using GNU tools)
-> type: cd c:\wxWindows\build\msw
-> type: make -f makefile.gcc (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++)
etc.
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/
See docs/msw/install.txt for details; in brief
See docs/msw/install.txt for details; in brief:
-> type cd c:\wxWindows\build\msw
-> type make -f makefile.bcc
You can customize many things in the build process, detailed description is
in docs/msw/install.txt.
-> type set WXWIN=c:\wxwindows
-> type cd %WXWIN%\src\msw
-> type make -f makefile.b32
II) Unix ports
--------------
@@ -81,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).
@@ -141,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).
@@ -154,6 +162,7 @@ or type: ../configure
VI) OS/2
----------------------------------------
No notes.
VII) Unix->Windows cross-compiling using configure
--------------------------------------------------

29490
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

@@ -88,14 +88,11 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
if test "$cross_compiling" = "yes"; then
ifelse([$2], , :, [$2])
else
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -108,7 +105,6 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
fi
AC_LANG_RESTORE
fi
])
dnl ---------------------------------------------------------------------------
@@ -598,3 +594,22 @@ if test "$ac_cv_cxx_const_cast" = yes; then
AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
fi
])
dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
AC_DEFUN([AC_CXX_STATIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
ac_cv_cxx_static_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0; };
class Derived : public Base { public : Derived () {} virtual void f () {} };
int g (Derived&) { return 0; }],[
Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_static_cast" = yes; then
AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
fi
])

582
aclocal.m4 vendored
View File

@@ -1,6 +1,6 @@
# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 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,
@@ -612,6 +612,25 @@ if test "$ac_cv_cxx_const_cast" = yes; then
fi
])
dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
AC_DEFUN([AC_CXX_STATIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
ac_cv_cxx_static_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0; };
class Derived : public Base { public : Derived () {} virtual void f () {} };
int g (Derived&) { return 0; }],[
Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_static_cast" = yes; then
AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
fi
])
# Configure paths for GTK+
# Owen Taylor 1997-2001
@@ -1062,6 +1081,182 @@ AC_DEFUN(PKG_CHECK_MODULES, [
# Configure paths for SDL
# Sam Lantinga 9/21/99
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
, enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_args="$sdl_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
AC_REQUIRE([AC_CANONICAL_TARGET])
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent
dnl
rm -f conf.sdltest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "SDL.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.sdltest");
*/
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_sdl_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_sdl_version");
exit(1);
}
if (($sdl_major_version > major) ||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the SDL_CONFIG environment variable to the"
echo "*** full path to sdl-config."
else
if test -f conf.sdltest ; then
:
else
echo "*** Could not run SDL test program, checking why..."
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "SDL.h"
int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SDL_CFLAGS=""
SDL_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])
dnl ---------------------------------------------------------------------------
dnl Support macros for makefiles generated by BAKEFILE.
dnl ---------------------------------------------------------------------------
@@ -1111,28 +1306,57 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
PLATFORM_WIN32=1
;;
*-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
PLATFORM_MSDOS=1
;;
powerpc-*-darwin* )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
;;
* )
PLATFORM_UNIX=1
;;
esac
PLATFORM_OS2=0
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
case "${BAKEFILE_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
else
case "$BAKEFILE_FORCE_PLATFORM" in
win32 )
PLATFORM_WIN32=1
;;
msdos )
PLATFORM_MSDOS=1
;;
os2 )
PLATFORM_OS2=1
;;
darwin )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
;;
unix )
PLATFORM_UNIX=1
;;
* )
AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
;;
esac
fi
AC_SUBST(PLATFORM_UNIX)
AC_SUBST(PLATFORM_WIN32)
AC_SUBST(PLATFORM_MSDOS)
AC_SUBST(PLATFORM_MAC)
AC_SUBST(PLATFORM_MACOSX)
AC_SUBST(PLATFORM_OS2)
])
@@ -1147,12 +1371,16 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SUFFIXES,
[
SO_SUFFIX="so"
SO_SUFFIX_MODULE="so"
EXEEXT=""
LIBPREFIX=lib
DLLPREFIX=lib
DLLPREFIX_MODULE=
case "${host}" in
case "${BAKEFILE_HOST}" in
*-hp-hpux* )
SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;;
*-*-aix* )
dnl quoting from
@@ -1161,24 +1389,37 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
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 | *-pc-os2_emx | *-pc-os2-emx )
*-pc-msdosdjgpp )
EXEEXT=".exe"
DLLPREFIX=""
;;
*-pc-os2_emx | *-pc-os2-emx )
SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll"
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)
])
@@ -1201,7 +1442,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
PIC_FLAG="-fPIC"
fi
case "${host}" in
case "${BAKEFILE_HOST}" in
*-hp-hpux* )
dnl default settings are good for gcc but not for the native HP-UX
if test "x$GCC" = "xyes"; then
@@ -1258,7 +1499,27 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
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
dnl If using newer dev tools then there is a -single_module flag that
dnl we can use to do this, otherwise we'll need to use a helper
dnl script. Check the version of gcc to see which way we can go:
AC_CACHE_CHECK([for gcc 3.1 or later], wx_cv_gcc31, [
AC_TRY_COMPILE([],
[
#if (__GNUC__ < 3) || \
((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
#error old gcc
#endif
],
[
wx_cv_gcc31=yes
],
[
wx_cv_gcc31=no
]
)
])
if test "$wx_cv_gcc31" = "no"; then
cat <<EOF >shared-ld-sh
#!/bin/sh
#-----------------------------------------------------------------------------
#-- Name: distrib/mac/shared-ld-sh
@@ -1271,6 +1532,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
verbose=0
args=""
objects=""
linking_flag="-dynamiclib"
while test \${#} -gt 0; do
case \${1} in
@@ -1285,13 +1547,13 @@ while test \${#} -gt 0; do
shift
;;
-l*|-L*|-flat_namespace)
-l*|-L*|-flat_namespace|-headerpad_max_install_names)
# collect these options
args="\${args} \${1}"
;;
-dynamiclib)
# skip these options
-dynamiclib|-bundle)
linking_flag="\${1}"
;;
-*)
@@ -1299,7 +1561,7 @@ while test \${#} -gt 0; do
exit 1
;;
*.o | *.a)
*.o | *.a | *.dylib)
# collect object files
objects="\${objects} \${1}"
;;
@@ -1329,9 +1591,9 @@ fi
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
echo "cc -dynamiclib master.\$\$.o \${args}"
echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
c++ -dynamiclib master.\$\$.o \${args}
c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
@@ -1344,15 +1606,22 @@ rm -f master.\$\$.o
exit 0
EOF
chmod +x shared-ld-sh
chmod +x shared-ld-sh
dnl Use the shared-ld-sh helper script
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
else
dnl Use the -single_module flag and let the linker do it for us
SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
fi
SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_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* )
@@ -1386,6 +1655,12 @@ EOF
PIC_FLAG=""
;;
*-pc-os2_emx | *-pc-os2-emx )
SHARED_LD_CC="dllar.sh -o"
SHARED_LD_CXX="dllar.sh -o"
PIC_FLAG=""
;;
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-sunos4* | \
*-*-osf* | \
@@ -1395,11 +1670,20 @@ EOF
;;
*)
AC_MSG_ERROR(unknown system type $host.)
AC_MSG_ERROR(unknown system type $BAKEFILE_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)
])
@@ -1419,7 +1703,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
USE_MACVERSION=0
SONAME_FLAG=
case "${host}" in
case "${BAKEFILE_HOST}" in
*-*-linux* )
SONAME_FLAG="-Wl,-soname,"
USE_SOVERSION=1
@@ -1464,6 +1748,16 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
DEPS_TRACKING=1
case "${BAKEFILE_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])
@@ -1473,18 +1767,19 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
cat <<EOF >bk-deps
#!/bin/sh
# This script is part of Bakefile (http://bakefile.sf.net) autoconf script.
# It is used to track C/C++ files dependencies in portable way.
# 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
\${*} -MMD
\${*} \${DEPSFLAG_GCC}
status=\${?}
if test \${status} != 0 ; then
exit \${status}
@@ -1512,7 +1807,7 @@ if test \$DEPSMODE = gcc ; then
else
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
if test -f \$depfile ; then
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
sed -e "/^\$objfile/!s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
rm -f \$depfile
fi
fi
@@ -1544,15 +1839,11 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
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
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(NM, nm, :)
case ${host} in
case ${BAKEFILE_HOST} in
*-hp-hpux* )
INSTALL_DIR="mkdir"
;;
@@ -1562,7 +1853,7 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
AC_SUBST(INSTALL_DIR)
LDFLAGS_GUI=
case ${host} in
case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* )
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
esac
@@ -1581,7 +1872,7 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
RESCOMP=
SETFILE=
case ${host} in
case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* )
dnl Check for win32 resources compiler:
if test "$build" != "$host" ; then
@@ -1601,14 +1892,122 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
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
dnl Behaviour can be modified by setting following variables:
dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to
dnl to perform check for basic tools like ranlib
dnl BAKEFILE_HOST set this to override host detection, defaults
dnl to ${host}
dnl BAKEFILE_FORCE_PLATFORM set to override platform detection
dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE,
[
if test "x$BAKEFILE_HOST" = "x"; then
BAKEFILE_HOST="${host}"
fi
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
AC_BAKEFILE_CHECK_BASIC_STUFF
fi
@@ -1623,3 +2022,84 @@ AC_DEFUN(AC_BAKEFILE,
builtin(include, autoconf_inc.m4)
])
dnl
dnl AM_PATH_CPPUNIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
AC_DEFUN(AM_PATH_CPPUNIT,
[
AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
cppunit_config_prefix="$withval", cppunit_config_prefix="")
AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
if test x$cppunit_config_exec_prefix != x ; then
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
fi
fi
if test x$cppunit_config_prefix != x ; then
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
fi
fi
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
cppunit_version_min=$1
AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
no_cppunit=""
if test "$CPPUNIT_CONFIG" = "no" ; then
no_cppunit=yes
else
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
cppunit_version=`$CPPUNIT_CONFIG --version`
cppunit_major_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_major_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_version_proper=`expr \
$cppunit_major_version \> $cppunit_major_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \> $cppunit_minor_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \= $cppunit_minor_min \& \
$cppunit_micro_version \>= $cppunit_micro_min `
if test "$cppunit_version_proper" = "1" ; then
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
else
AC_MSG_RESULT(no)
no_cppunit=yes
fi
fi
if test "x$no_cppunit" = x ; then
ifelse([$2], , :, [$2])
else
CPPUNIT_CFLAGS=""
CPPUNIT_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
])

View File

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

View File

@@ -1,76 +1,150 @@
/* XPM */
static char * exefile_xpm[] = {
"16 16 57 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #650000",
"# c #CB0000",
"$ c #700000",
"% c #CDCDCD",
"& c #D2D2D2",
"* c #D7D7D7",
"= c #282829",
"- c #FF0000",
"; c #E60000",
"> c #FFFFFF",
", c #505052",
"' c #78787B",
") c #CC0000",
"! c #F70000",
"~ c #A0A0A4",
"{ c #8C4848",
"] c #FFA0A0",
"^ c #A95959",
"/ c #DBDBDB",
"( c #F7F7F7",
"_ c #0000C8",
": c #0000F4",
"< c #ECECEC",
"[ c #1010BC",
"} c #1313E8",
"| c #EDEDED",
"1 c #8B8B8B",
"2 c #AFAFAF",
"3 c #C4C4C4",
"4 c #FDFDFD",
"5 c #E8E8E8",
"6 c #FFFF00",
"7 c #007300",
"8 c #00B200",
"9 c #BFBFBF",
"0 c #CBCBCB",
"a c #DEDEDE",
"b c #00A800",
"c c #00FF00",
"d c #BEBEBE",
"e c #FCFCFC",
"f c #7D7D7D",
"g c #F8F8F8",
"h c #888888",
"i c #F8F800",
"j c #F7F700",
"k c #006200",
"l c #00A100",
"m c #757575",
"n c #959595",
"o c #404040",
"p c #1F1F1F",
"q c #3F3F3F",
"r c #2F2F2F",
" ",
" ........ ",
" .+@#$%&*= ",
" .+#-;>>>,' ",
" .+)-!>>>,~' ",
" .+{]^>>>=,,= ",
" .+/>(>>>>>_:. ",
" .+<>>>>>>>[}. ",
" .+|>>>>>>>12. ",
" .+|>>>>>>>34. ",
" .+/>56667894. ",
" .+0>a666bcde. ",
" .+fghiijklmn. ",
" .o++++++++++. ",
" .pqqqpprqqqq. ",
" "};
"16 16 131 2",
" c None",
". c #D0D0DF",
"+ c #9C9CB6",
"@ c #FFFFFF",
"# c #F9F9FE",
"$ c #F5F5FC",
"% c #E9E9F2",
"& c #EBEBF4",
"* c #5BB5F6",
"= c #AAC6E6",
"- c #D3E9FB",
"; c #D2E8FB",
"> c #FCFCFF",
", c #F8F8FE",
"' c #ECECF4",
") c #D3D3E1",
"! c #60BBF8",
"~ c #11D8FD",
"{ c #24C9F9",
"] c #31BBF5",
"^ c #24BFF6",
"/ c #B9D8F7",
"( c #EFEFF6",
"_ c #1DC9FD",
": c #16CFFC",
"< c #0DB1F1",
"[ c #237EDC",
"} c #2C75D7",
"| c #2A93E5",
"1 c #349EEC",
"2 c #2C9EEC",
"3 c #B0CDF4",
"4 c #F1F1F8",
"5 c #E6E6F0",
"6 c #D7D7E5",
"7 c #C9C9DA",
"8 c #26A4FA",
"9 c #04C3FA",
"0 c #2E7FDB",
"a c #5B9BDA",
"b c #4E9ADE",
"c c #368EDA",
"d c #3D96E2",
"e c #3BA7F0",
"f c #7EAEEC",
"g c #F2F2F9",
"h c #EEEEF5",
"i c #DADAE7",
"j c #CECEDD",
"k c #CCCCDB",
"l c #37B8F8",
"m c #10BEFD",
"n c #0AB0F6",
"o c #C3E5F7",
"p c #51BAEB",
"q c #4EB6EF",
"r c #28A4F1",
"s c #62A3E9",
"t c #D5D5E4",
"u c #D2D2E0",
"v c #2AA5F9",
"w c #00ACFF",
"x c #03B4FD",
"y c #3189E5",
"z c #C8F2FD",
"A c #55DBFB",
"B c #32BDFD",
"C c #0E96EE",
"D c #B0C1E7",
"E c #DCDCE9",
"F c #DBDBE8",
"G c #D8D8E6",
"H c #3A9AF3",
"I c #1F8AF7",
"J c #00A6FF",
"K c #18A1F6",
"L c #94B9E4",
"M c #FEFEFF",
"N c #FDFDFF",
"O c #6FE4FF",
"P c #2FBAFF",
"Q c #2579DF",
"R c #D8DDED",
"S c #E0E0EC",
"T c #DEDEEB",
"U c #4396EA",
"V c #08A0FC",
"W c #00A2FF",
"X c #18A2FA",
"Y c #61B7F6",
"Z c #B0DEFC",
"` c #B0E0FD",
" . c #5AC3FE",
".. c #07A5FF",
"+. c #0399FA",
"@. c #7EA0E1",
"#. c #E5E5EF",
"$. c #E1E1ED",
"%. c #2F9BEE",
"&. c #00A0FF",
"*. c #00A5FF",
"=. c #00A3FF",
"-. c #0098FF",
";. c #009FFF",
">. c #078FEE",
",. c #8BA8E4",
"'. c #E4E4EE",
"). c #3A8AE5",
"!. c #1AA8F0",
"~. c #2A89E5",
"{. c #0EB5F5",
"]. c #0095FF",
"^. c #00B9FF",
"/. c #087AEB",
"(. c #5583DB",
"_. c #EAEAF3",
":. c #E7E7F0",
"<. c #4782DC",
"[. c #00ADFF",
"}. c #0C83ED",
"|. c #2C99E6",
"1. c #01CAFC",
"2. c #1779E3",
"3. c #C4D0EE",
"4. c #598ADA",
"5. c #0EA2EA",
"6. c #6A9FE5",
"7. c #C8D5F1",
"8. c #568CDF",
"9. c #C4D1EE",
"0. c #F3F3F9",
" . . . . . . . . + ",
" . @ @ @ # $ % & . + ",
" * = - ; @ > , ' & . ) + ",
" ! * ~ { ] ^ / > # ( & + + + + ",
" _ : < [ } | 1 2 3 4 & 5 6 7 + ",
"* 8 9 0 a b c d e f g h i j k + ",
"l m n . @ o p q r s & t u . + ",
"v w x y . @ @ z A B C D E F G + ",
"H I J K L @ M N O P Q R S T E + ",
" U V W X Y Z ` ...+.@.#.$.S + ",
" %.&.*.=.-.-.-.-.;.>.,.5 '.S + ",
" ).!.~.{.].].^.=./.(._.:.#.$.+ ",
" <.[.}.|.1.2.3._.:.#.$.+ ",
" 4.5.6.7.8.9.' _.5 #.$.+ ",
" . > 0.0.4 ( & _.:.#.$.+ ",
" + + + + + + + + + + + + "};

View File

@@ -7,19 +7,19 @@ static char * home_xpm[] = {
" ",
" ",
" .. ",
" . .... ",
" . .XX . ",
" . .XXXX . ",
" ..XXXXXX . ",
" .XXXXXXXX . ",
" .XXXXXXXXX . ",
" ...XXXXXXXX ... ",
" .XXXXXXXX . ",
" .XXX...XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" .XXX. .XX . ",
" . .XX. ",
" . .XXXX. ",
" . .XXXXXX. ",
" ..XXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" ...XXXXXXXXXX... ",
" .XXXXXXXXXX. ",
" .XXX...XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" .XXX. .XXXX. ",
" ..... ...... ",
" ",
" ",

View File

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

View File

@@ -1,384 +1,639 @@
dnl This macro was generated by
dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
dnl Bakefile 0.1.3 (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 ### begin block 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 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 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 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 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 COND_TOOLKIT_COCOA_USE_GUI_1 ###
COND_TOOLKIT_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_COCOA_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
dnl ### begin block 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 COND_MONOLITHIC_1 ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
fi
AC_SUBST(COND_MONOLITHIC_1)
dnl ### begin block COND_UNICODE_1 ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
AC_SUBST(COND_UNICODE_1)
dnl ### begin block COND_MONOLITHIC_0 ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
fi
AC_SUBST(COND_MONOLITHIC_0)
dnl ### begin block COND_TOOLKIT_MGL ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
fi
AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block 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 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 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 COND_WXUNIV_1 ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
fi
AC_SUBST(COND_WXUNIV_1)
dnl ### begin block 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 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 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 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 ###
COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
fi
AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1)
dnl ### begin block 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 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 COND_TOOLKIT_X11 ###
COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11=""
fi
AC_SUBST(COND_TOOLKIT_X11)
dnl ### begin block COND_OFFICIAL_BUILD_0 ###
COND_OFFICIAL_BUILD_0="#"
if test "x$OFFICIAL_BUILD" = "x0" ; then
COND_OFFICIAL_BUILD_0=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_0)
dnl ### begin block COND_TOOLKIT_OS2 ###
COND_TOOLKIT_OS2="#"
if test "x$TOOLKIT" = "xOS2" ; then
COND_TOOLKIT_OS2=""
fi
AC_SUBST(COND_TOOLKIT_OS2)
dnl ### begin block 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 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)
dnl ### begin block COND_TOOLKIT_MOTIF ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block 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 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 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 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 ###
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1)
dnl ### begin block 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 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 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 COND_TOOLKIT_MSW ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
fi
AC_SUBST(COND_TOOLKIT_MSW)
dnl ### begin block 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 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ###
COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0)
dnl ### begin block COND_BUILD_DEBUG ###
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 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 ###
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
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_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1)
dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=""
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_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block COND_OFFICIAL_BUILD_1 ###
COND_OFFICIAL_BUILD_1="#"
if test "x$OFFICIAL_BUILD" = "x1" ; then
COND_OFFICIAL_BUILD_1=""
AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
dnl ### begin block 1_COND_BUILD_DEBUG_UNICODE_0 ###
COND_BUILD_DEBUG_UNICODE_0="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
COND_BUILD_DEBUG_UNICODE_0=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_1)
dnl ### begin block COND_BUILD_RELEASE ###
AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
dnl ### begin block 1_COND_BUILD_DEBUG_UNICODE_1 ###
COND_BUILD_DEBUG_UNICODE_1="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
COND_BUILD_DEBUG_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
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 COND_USE_SOVERLINUX_1 ###
COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX_1=""
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_USE_SOVERLINUX_1)
dnl ### begin block COND_USE_SOSYMLINKS_1 ###
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
dnl ### begin block 1_COND_BUILD_RELEASE_UNICODE_0 ###
COND_BUILD_RELEASE_UNICODE_0="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
COND_BUILD_RELEASE_UNICODE_0=""
fi
AC_SUBST(COND_USE_SOSYMLINKS_1)
dnl ### begin block COND_TOOLKIT_COCOA ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=""
AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
dnl ### begin block 1_COND_BUILD_RELEASE_UNICODE_1 ###
COND_BUILD_RELEASE_UNICODE_1="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
COND_BUILD_RELEASE_UNICODE_1=""
fi
AC_SUBST(COND_TOOLKIT_COCOA)
dnl ### begin block COND_PLATFORM_MACOSX_1 ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1=""
AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
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_PLATFORM_MACOSX_1)
dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
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_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNG_BUILTIN=""
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_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 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=""
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_MONOLITHIC_0_SHARED_1_USE_GUI_1)
dnl ### begin block 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=""
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_PLATFORM_MACOSX_0_USE_SOVERSION_1)
dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 ###
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
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_TOOLKIT_X11_USE_GUI_1_WXUNIV_1)
dnl ### begin block 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=""
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_USE_GUI_1_WXUNIV_0)
dnl ### begin block 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=""
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_USE_GUI_1_WXUNIV_1)
dnl ### begin block COND_TOOLKIT_GTK ###
COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK=""
fi
AC_SUBST(COND_TOOLKIT_GTK)
dnl ### begin block 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 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 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 COND_TOOLKIT_MAC ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 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 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
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 COND_SHARED_1 ###
COND_SHARED_1="#"
if test "x$SHARED" = "x1" ; then
COND_SHARED_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_SHARED_1)
dnl ### begin block COND_PLATFORM_MAC_1 ###
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_0_USE_ODBC_1 ###
COND_MONOLITHIC_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_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_GUI_1 ###
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
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 COND_SHARED_0 ###
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_UNIX_1_USE_GUI_1 ###
COND_PLATFORM_UNIX_1_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_GUI_1)
dnl ### begin block 1_COND_PLATFORM_UNIX_1_USE_PLUGINS_0 ###
COND_PLATFORM_UNIX_1_USE_PLUGINS_0="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_PLUGINS" = "x0" ; then
COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
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_EXCEPTIONS_0 ###
COND_USE_EXCEPTIONS_0="#"
if test "x$USE_EXCEPTIONS" = "x0" ; then
COND_USE_EXCEPTIONS_0=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_0)
dnl ### begin block 1_COND_USE_EXCEPTIONS_1 ###
COND_USE_EXCEPTIONS_1="#"
if test "x$USE_EXCEPTIONS" = "x1" ; then
COND_USE_EXCEPTIONS_1=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_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_ODBC_1 ###
COND_USE_ODBC_1="#"
if test "x$USE_ODBC" = "x1" ; then
COND_USE_ODBC_1=""
fi
AC_SUBST(COND_USE_ODBC_1)
dnl ### begin block 1_COND_USE_PLUGINS_0 ###
COND_USE_PLUGINS_0="#"
if test "x$USE_PLUGINS" = "x0" ; then
COND_USE_PLUGINS_0=""
fi
AC_SUBST(COND_USE_PLUGINS_0)
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_WITH_PLUGIN_SDL_1 ###
COND_WITH_PLUGIN_SDL_1="#"
if test "x$WITH_PLUGIN_SDL" = "x1" ; then
COND_WITH_PLUGIN_SDL_1=""
fi
AC_SUBST(COND_WITH_PLUGIN_SDL_1)
dnl ### begin block 1_COND_WITH_SDL_1 ###
COND_WITH_SDL_1="#"
if test "x$WITH_SDL" = "x1" ; then
COND_WITH_SDL_1=""
fi
AC_SUBST(COND_WITH_SDL_1)
dnl ### begin block 1_COND_WXUNIV_1 ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
fi
AC_SUBST(COND_WXUNIV_1)
dnl ### begin block 1_COND_WXUSE_EXPAT_BUILTIN ###
COND_WXUSE_EXPAT_BUILTIN="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBJPEG_BUILTIN ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBPNG_BUILTIN ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 1_COND_WXUSE_LIBTIFF_BUILTIN ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 1_COND_WXUSE_ODBC_BUILTIN ###
COND_WXUSE_ODBC_BUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBC_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
dnl ### begin block 1_COND_WXUSE_REGEX_BUILTIN ###
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
dnl ### begin block 1_COND_WXUSE_ZLIB_BUILTIN ###
COND_WXUSE_ZLIB_BUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)

View File

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

View File

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

View File

@@ -1,791 +0,0 @@
# Generated by regenMakefile.py
BAKEFILE = bakefile
BAKEARGS = -v
AUTOCONF_ALL = ../../configure ../../Makefile.in ../../samples/Makefile.in ../../samples/db/Makefile.in ../../samples/dnd/Makefile.in ../../samples/ipc/Makefile.in ../../samples/mdi/Makefile.in ../../samples/mfc/Makefile.in ../../samples/png/Makefile.in ../../samples/tab/Makefile.in ../../samples/exec/Makefile.in ../../samples/font/Makefile.in ../../samples/help/Makefile.in ../../samples/grid/Makefile.in ../../samples/menu/Makefile.in ../../samples/text/Makefile.in ../../samples/console/Makefile.in ../../samples/treectrl/Makefile.in ../../samples/listctrl/Makefile.in ../../samples/joytest/Makefile.in ../../samples/regtest/Makefile.in ../../samples/dialogs/Makefile.in ../../samples/nativdlg/Makefile.in ../../samples/display/Makefile.in ../../samples/notebook/Makefile.in ../../samples/caret/Makefile.in ../../samples/erase/Makefile.in ../../samples/event/Makefile.in ../../samples/image/Makefile.in ../../samples/sashtest/Makefile.in ../../samples/docview/Makefile.in ../../samples/typetest/Makefile.in ../../samples/drawing/Makefile.in ../../samples/splitter/Makefile.in ../../samples/listbox/Makefile.in ../../samples/multimon/Makefile.in ../../samples/dynamic/Makefile.in ../../samples/checklst/Makefile.in ../../samples/taskbar/Makefile.in ../../samples/dragimag/Makefile.in ../../samples/sockets/Makefile.in ../../samples/calendar/Makefile.in ../../samples/minimal/Makefile.in ../../samples/access/Makefile.in ../../samples/statbar/Makefile.in ../../samples/config/Makefile.in ../../samples/dialup/Makefile.in ../../samples/controls/Makefile.in ../../samples/richedit/Makefile.in ../../samples/newgrid/Makefile.in ../../samples/toolbar/Makefile.in ../../samples/htlbox/Makefile.in ../../samples/layout/Makefile.in ../../samples/minifram/Makefile.in ../../samples/mobile/Makefile.in ../../samples/opengl/Makefile.in ../../samples/scroll/Makefile.in ../../samples/rotate/Makefile.in ../../samples/shaped/Makefile.in ../../samples/thread/Makefile.in ../../samples/wizard/Makefile.in ../../samples/printing/Makefile.in ../../samples/oleauto/Makefile.in ../../samples/wxtest/Makefile.in ../../samples/artprov/Makefile.in ../../samples/propsize/Makefile.in ../../samples/ownerdrw/Makefile.in ../../samples/vscroll/Makefile.in ../../samples/validate/Makefile.in ../../samples/widgets/Makefile.in ../../samples/keyboard/Makefile.in ../../samples/docvwmdi/Makefile.in ../../samples/scrollsub/Makefile.in ../../samples/memcheck/Makefile.in ../../samples/internat/Makefile.in ../../contrib/src/xrc/Makefile.in ../../contrib/src/gizmos/Makefile.in
BORLAND_ALL = ../makefile.bcc ../../samples/makefile.bcc ../../samples/db/makefile.bcc ../../samples/dnd/makefile.bcc ../../samples/ipc/makefile.bcc ../../samples/mdi/makefile.bcc ../../samples/mfc/makefile.bcc ../../samples/png/makefile.bcc ../../samples/tab/makefile.bcc ../../samples/exec/makefile.bcc ../../samples/font/makefile.bcc ../../samples/help/makefile.bcc ../../samples/grid/makefile.bcc ../../samples/menu/makefile.bcc ../../samples/text/makefile.bcc ../../samples/console/makefile.bcc ../../samples/treectrl/makefile.bcc ../../samples/listctrl/makefile.bcc ../../samples/joytest/makefile.bcc ../../samples/regtest/makefile.bcc ../../samples/dialogs/makefile.bcc ../../samples/nativdlg/makefile.bcc ../../samples/display/makefile.bcc ../../samples/notebook/makefile.bcc ../../samples/caret/makefile.bcc ../../samples/erase/makefile.bcc ../../samples/event/makefile.bcc ../../samples/image/makefile.bcc ../../samples/sashtest/makefile.bcc ../../samples/docview/makefile.bcc ../../samples/typetest/makefile.bcc ../../samples/drawing/makefile.bcc ../../samples/splitter/makefile.bcc ../../samples/listbox/makefile.bcc ../../samples/multimon/makefile.bcc ../../samples/dynamic/makefile.bcc ../../samples/checklst/makefile.bcc ../../samples/taskbar/makefile.bcc ../../samples/dragimag/makefile.bcc ../../samples/sockets/makefile.bcc ../../samples/calendar/makefile.bcc ../../samples/minimal/makefile.bcc ../../samples/access/makefile.bcc ../../samples/statbar/makefile.bcc ../../samples/config/makefile.bcc ../../samples/dialup/makefile.bcc ../../samples/controls/makefile.bcc ../../samples/richedit/makefile.bcc ../../samples/newgrid/makefile.bcc ../../samples/toolbar/makefile.bcc ../../samples/htlbox/makefile.bcc ../../samples/layout/makefile.bcc ../../samples/minifram/makefile.bcc ../../samples/mobile/makefile.bcc ../../samples/opengl/makefile.bcc ../../samples/scroll/makefile.bcc ../../samples/rotate/makefile.bcc ../../samples/shaped/makefile.bcc ../../samples/thread/makefile.bcc ../../samples/wizard/makefile.bcc ../../samples/printing/makefile.bcc ../../samples/oleauto/makefile.bcc ../../samples/wxtest/makefile.bcc ../../samples/artprov/makefile.bcc ../../samples/propsize/makefile.bcc ../../samples/ownerdrw/makefile.bcc ../../samples/vscroll/makefile.bcc ../../samples/validate/makefile.bcc ../../samples/widgets/makefile.bcc ../../samples/keyboard/makefile.bcc ../../samples/docvwmdi/makefile.bcc ../../samples/scrollsub/makefile.bcc ../../samples/memcheck/makefile.bcc ../../samples/internat/makefile.bcc ../../contrib/build/xrc/makefile.bcc ../../contrib/build/gizmos/makefile.bcc
all: autoconf borland
autoconf: $(AUTOCONF_ALL)
borland: $(BORLAND_ALL)
clean:
rm -f ../../autoconf_inc.m4
rm -f ../../configure
rm -f ../../Makefile.in
rm -f ../../samples/Makefile.in
rm -f ../../samples/db/Makefile.in
rm -f ../../samples/dnd/Makefile.in
rm -f ../../samples/ipc/Makefile.in
rm -f ../../samples/mdi/Makefile.in
rm -f ../../samples/mfc/Makefile.in
rm -f ../../samples/png/Makefile.in
rm -f ../../samples/tab/Makefile.in
rm -f ../../samples/exec/Makefile.in
rm -f ../../samples/font/Makefile.in
rm -f ../../samples/help/Makefile.in
rm -f ../../samples/grid/Makefile.in
rm -f ../../samples/menu/Makefile.in
rm -f ../../samples/text/Makefile.in
rm -f ../../samples/console/Makefile.in
rm -f ../../samples/treectrl/Makefile.in
rm -f ../../samples/listctrl/Makefile.in
rm -f ../../samples/joytest/Makefile.in
rm -f ../../samples/regtest/Makefile.in
rm -f ../../samples/dialogs/Makefile.in
rm -f ../../samples/nativdlg/Makefile.in
rm -f ../../samples/display/Makefile.in
rm -f ../../samples/notebook/Makefile.in
rm -f ../../samples/caret/Makefile.in
rm -f ../../samples/erase/Makefile.in
rm -f ../../samples/event/Makefile.in
rm -f ../../samples/image/Makefile.in
rm -f ../../samples/sashtest/Makefile.in
rm -f ../../samples/docview/Makefile.in
rm -f ../../samples/typetest/Makefile.in
rm -f ../../samples/drawing/Makefile.in
rm -f ../../samples/splitter/Makefile.in
rm -f ../../samples/listbox/Makefile.in
rm -f ../../samples/multimon/Makefile.in
rm -f ../../samples/dynamic/Makefile.in
rm -f ../../samples/checklst/Makefile.in
rm -f ../../samples/taskbar/Makefile.in
rm -f ../../samples/dragimag/Makefile.in
rm -f ../../samples/sockets/Makefile.in
rm -f ../../samples/calendar/Makefile.in
rm -f ../../samples/minimal/Makefile.in
rm -f ../../samples/access/Makefile.in
rm -f ../../samples/statbar/Makefile.in
rm -f ../../samples/config/Makefile.in
rm -f ../../samples/dialup/Makefile.in
rm -f ../../samples/controls/Makefile.in
rm -f ../../samples/richedit/Makefile.in
rm -f ../../samples/newgrid/Makefile.in
rm -f ../../samples/toolbar/Makefile.in
rm -f ../../samples/htlbox/Makefile.in
rm -f ../../samples/layout/Makefile.in
rm -f ../../samples/minifram/Makefile.in
rm -f ../../samples/mobile/Makefile.in
rm -f ../../samples/opengl/Makefile.in
rm -f ../../samples/scroll/Makefile.in
rm -f ../../samples/rotate/Makefile.in
rm -f ../../samples/shaped/Makefile.in
rm -f ../../samples/thread/Makefile.in
rm -f ../../samples/wizard/Makefile.in
rm -f ../../samples/printing/Makefile.in
rm -f ../../samples/oleauto/Makefile.in
rm -f ../../samples/wxtest/Makefile.in
rm -f ../../samples/artprov/Makefile.in
rm -f ../../samples/propsize/Makefile.in
rm -f ../../samples/ownerdrw/Makefile.in
rm -f ../../samples/vscroll/Makefile.in
rm -f ../../samples/validate/Makefile.in
rm -f ../../samples/widgets/Makefile.in
rm -f ../../samples/keyboard/Makefile.in
rm -f ../../samples/docvwmdi/Makefile.in
rm -f ../../samples/scrollsub/Makefile.in
rm -f ../../samples/memcheck/Makefile.in
rm -f ../../samples/internat/Makefile.in
rm -f ../../contrib/src/xrc/Makefile.in
rm -f ../../contrib/src/gizmos/Makefile.in
rm -f ../makefile.bcc
rm -f ../../samples/makefile.bcc
rm -f ../../samples/db/makefile.bcc
rm -f ../../samples/dnd/makefile.bcc
rm -f ../../samples/ipc/makefile.bcc
rm -f ../../samples/mdi/makefile.bcc
rm -f ../../samples/mfc/makefile.bcc
rm -f ../../samples/png/makefile.bcc
rm -f ../../samples/tab/makefile.bcc
rm -f ../../samples/exec/makefile.bcc
rm -f ../../samples/font/makefile.bcc
rm -f ../../samples/help/makefile.bcc
rm -f ../../samples/grid/makefile.bcc
rm -f ../../samples/menu/makefile.bcc
rm -f ../../samples/text/makefile.bcc
rm -f ../../samples/console/makefile.bcc
rm -f ../../samples/treectrl/makefile.bcc
rm -f ../../samples/listctrl/makefile.bcc
rm -f ../../samples/joytest/makefile.bcc
rm -f ../../samples/regtest/makefile.bcc
rm -f ../../samples/dialogs/makefile.bcc
rm -f ../../samples/nativdlg/makefile.bcc
rm -f ../../samples/display/makefile.bcc
rm -f ../../samples/notebook/makefile.bcc
rm -f ../../samples/caret/makefile.bcc
rm -f ../../samples/erase/makefile.bcc
rm -f ../../samples/event/makefile.bcc
rm -f ../../samples/image/makefile.bcc
rm -f ../../samples/sashtest/makefile.bcc
rm -f ../../samples/docview/makefile.bcc
rm -f ../../samples/typetest/makefile.bcc
rm -f ../../samples/drawing/makefile.bcc
rm -f ../../samples/splitter/makefile.bcc
rm -f ../../samples/listbox/makefile.bcc
rm -f ../../samples/multimon/makefile.bcc
rm -f ../../samples/dynamic/makefile.bcc
rm -f ../../samples/checklst/makefile.bcc
rm -f ../../samples/taskbar/makefile.bcc
rm -f ../../samples/dragimag/makefile.bcc
rm -f ../../samples/sockets/makefile.bcc
rm -f ../../samples/calendar/makefile.bcc
rm -f ../../samples/minimal/makefile.bcc
rm -f ../../samples/access/makefile.bcc
rm -f ../../samples/statbar/makefile.bcc
rm -f ../../samples/config/makefile.bcc
rm -f ../../samples/dialup/makefile.bcc
rm -f ../../samples/controls/makefile.bcc
rm -f ../../samples/richedit/makefile.bcc
rm -f ../../samples/newgrid/makefile.bcc
rm -f ../../samples/toolbar/makefile.bcc
rm -f ../../samples/htlbox/makefile.bcc
rm -f ../../samples/layout/makefile.bcc
rm -f ../../samples/minifram/makefile.bcc
rm -f ../../samples/mobile/makefile.bcc
rm -f ../../samples/opengl/makefile.bcc
rm -f ../../samples/scroll/makefile.bcc
rm -f ../../samples/rotate/makefile.bcc
rm -f ../../samples/shaped/makefile.bcc
rm -f ../../samples/thread/makefile.bcc
rm -f ../../samples/wizard/makefile.bcc
rm -f ../../samples/printing/makefile.bcc
rm -f ../../samples/oleauto/makefile.bcc
rm -f ../../samples/wxtest/makefile.bcc
rm -f ../../samples/artprov/makefile.bcc
rm -f ../../samples/propsize/makefile.bcc
rm -f ../../samples/ownerdrw/makefile.bcc
rm -f ../../samples/vscroll/makefile.bcc
rm -f ../../samples/validate/makefile.bcc
rm -f ../../samples/widgets/makefile.bcc
rm -f ../../samples/keyboard/makefile.bcc
rm -f ../../samples/docvwmdi/makefile.bcc
rm -f ../../samples/scrollsub/makefile.bcc
rm -f ../../samples/memcheck/makefile.bcc
rm -f ../../samples/internat/makefile.bcc
rm -f ../../contrib/build/xrc/makefile.bcc
rm -f ../../contrib/build/gizmos/makefile.bcc
../../autoconf_inc.m4: ../../Makefile.in
../../configure: ../../autoconf_inc.m4
(cd ../.. ; aclocal && autoconf)
Makefile: regenMakefile.py
./regenMakefile.py
@echo
@echo -------------------------------------------
@echo Please rerun make, Makefile was regenerated
@echo -------------------------------------------
@echo
@exit 1
# from wx.bkl
../../Makefile.in: common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl wxwin.py wx.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../Makefile.in wx.bkl
touch ../../Makefile.in
../makefile.bcc: common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl wxwin.py wx.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../makefile.bcc wx.bkl
touch ../makefile.bcc
# from ../../samples/samples.bkl
../../samples/Makefile.in: ../../samples/samples.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/Makefile.in -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/samples.bkl
touch ../../samples/Makefile.in
../../samples/makefile.bcc: ../../samples/samples.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/makefile.bcc ../../samples/samples.bkl
touch ../../samples/makefile.bcc
# from ../../samples/db/db.bkl
../../samples/db/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/db/db.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/db/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl
touch ../../samples/db/Makefile.in
../../samples/db/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/db/db.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/db/makefile.bcc -DWXTOPDIR=../../ ../../samples/db/db.bkl
touch ../../samples/db/makefile.bcc
# from ../../samples/dnd/dnd.bkl
../../samples/dnd/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dnd/dnd.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dnd/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl
touch ../../samples/dnd/Makefile.in
../../samples/dnd/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/dnd/dnd.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/dnd/makefile.bcc -DWXTOPDIR=../../ ../../samples/dnd/dnd.bkl
touch ../../samples/dnd/makefile.bcc
# from ../../samples/ipc/ipc.bkl
../../samples/ipc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/ipc/ipc.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ipc/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl
touch ../../samples/ipc/Makefile.in
../../samples/ipc/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/ipc/ipc.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/ipc/makefile.bcc -DWXTOPDIR=../../ ../../samples/ipc/ipc.bkl
touch ../../samples/ipc/makefile.bcc
# from ../../samples/mdi/mdi.bkl
../../samples/mdi/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mdi/mdi.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mdi/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl
touch ../../samples/mdi/Makefile.in
../../samples/mdi/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/mdi/mdi.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/mdi/makefile.bcc -DWXTOPDIR=../../ ../../samples/mdi/mdi.bkl
touch ../../samples/mdi/makefile.bcc
# from ../../samples/mfc/mfc.bkl
../../samples/mfc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mfc/mfc.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mfc/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl
touch ../../samples/mfc/Makefile.in
../../samples/mfc/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/mfc/mfc.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/mfc/makefile.bcc -DWXTOPDIR=../../ ../../samples/mfc/mfc.bkl
touch ../../samples/mfc/makefile.bcc
# from ../../samples/png/png.bkl
../../samples/png/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/png/png.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/png/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl
touch ../../samples/png/Makefile.in
../../samples/png/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/png/png.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/png/makefile.bcc -DWXTOPDIR=../../ ../../samples/png/png.bkl
touch ../../samples/png/makefile.bcc
# from ../../samples/tab/tab.bkl
../../samples/tab/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/tab/tab.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/tab/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl
touch ../../samples/tab/Makefile.in
../../samples/tab/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/tab/tab.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/tab/makefile.bcc -DWXTOPDIR=../../ ../../samples/tab/tab.bkl
touch ../../samples/tab/makefile.bcc
# from ../../samples/exec/exec.bkl
../../samples/exec/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/exec/exec.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/exec/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl
touch ../../samples/exec/Makefile.in
../../samples/exec/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/exec/exec.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/exec/makefile.bcc -DWXTOPDIR=../../ ../../samples/exec/exec.bkl
touch ../../samples/exec/makefile.bcc
# from ../../samples/font/font.bkl
../../samples/font/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/font/font.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/font/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl
touch ../../samples/font/Makefile.in
../../samples/font/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/font/font.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/font/makefile.bcc -DWXTOPDIR=../../ ../../samples/font/font.bkl
touch ../../samples/font/makefile.bcc
# from ../../samples/help/help.bkl
../../samples/help/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/help/help.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/help/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl
touch ../../samples/help/Makefile.in
../../samples/help/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/help/help.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/help/makefile.bcc -DWXTOPDIR=../../ ../../samples/help/help.bkl
touch ../../samples/help/makefile.bcc
# from ../../samples/grid/grid.bkl
../../samples/grid/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/grid/grid.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/grid/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl
touch ../../samples/grid/Makefile.in
../../samples/grid/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/grid/grid.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/grid/makefile.bcc -DWXTOPDIR=../../ ../../samples/grid/grid.bkl
touch ../../samples/grid/makefile.bcc
# from ../../samples/menu/menu.bkl
../../samples/menu/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/menu/menu.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/menu/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl
touch ../../samples/menu/Makefile.in
../../samples/menu/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/menu/menu.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/menu/makefile.bcc -DWXTOPDIR=../../ ../../samples/menu/menu.bkl
touch ../../samples/menu/makefile.bcc
# from ../../samples/text/text.bkl
../../samples/text/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/text/text.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/text/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl
touch ../../samples/text/Makefile.in
../../samples/text/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/text/text.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/text/makefile.bcc -DWXTOPDIR=../../ ../../samples/text/text.bkl
touch ../../samples/text/makefile.bcc
# from ../../samples/console/console.bkl
../../samples/console/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/console/console.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/console/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/console/console.bkl
touch ../../samples/console/Makefile.in
../../samples/console/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/console/console.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/console/makefile.bcc -DWXTOPDIR=../../ ../../samples/console/console.bkl
touch ../../samples/console/makefile.bcc
# from ../../samples/treectrl/treectrl.bkl
../../samples/treectrl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/treectrl/treectrl.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/treectrl/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl
touch ../../samples/treectrl/Makefile.in
../../samples/treectrl/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/treectrl/treectrl.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/treectrl/makefile.bcc -DWXTOPDIR=../../ ../../samples/treectrl/treectrl.bkl
touch ../../samples/treectrl/makefile.bcc
# from ../../samples/listctrl/listctrl.bkl
../../samples/listctrl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/listctrl/listctrl.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listctrl/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl
touch ../../samples/listctrl/Makefile.in
../../samples/listctrl/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/listctrl/listctrl.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/listctrl/makefile.bcc -DWXTOPDIR=../../ ../../samples/listctrl/listctrl.bkl
touch ../../samples/listctrl/makefile.bcc
# from ../../samples/joytest/joytest.bkl
../../samples/joytest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/joytest/joytest.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/joytest/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl
touch ../../samples/joytest/Makefile.in
../../samples/joytest/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/joytest/joytest.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/joytest/makefile.bcc -DWXTOPDIR=../../ ../../samples/joytest/joytest.bkl
touch ../../samples/joytest/makefile.bcc
# from ../../samples/regtest/regtest.bkl
../../samples/regtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/regtest/regtest.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/regtest/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl
touch ../../samples/regtest/Makefile.in
../../samples/regtest/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/regtest/regtest.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/regtest/makefile.bcc -DWXTOPDIR=../../ ../../samples/regtest/regtest.bkl
touch ../../samples/regtest/makefile.bcc
# from ../../samples/dialogs/dialogs.bkl
../../samples/dialogs/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dialogs/dialogs.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialogs/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialogs/dialogs.bkl
touch ../../samples/dialogs/Makefile.in
../../samples/dialogs/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/dialogs/dialogs.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/dialogs/makefile.bcc -DWXTOPDIR=../../ ../../samples/dialogs/dialogs.bkl
touch ../../samples/dialogs/makefile.bcc
# from ../../samples/nativdlg/nativdlg.bkl
../../samples/nativdlg/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/nativdlg/nativdlg.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/nativdlg/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl
touch ../../samples/nativdlg/Makefile.in
../../samples/nativdlg/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/nativdlg/nativdlg.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/nativdlg/makefile.bcc -DWXTOPDIR=../../ ../../samples/nativdlg/nativdlg.bkl
touch ../../samples/nativdlg/makefile.bcc
# from ../../samples/display/display.bkl
../../samples/display/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/display/display.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/display/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl
touch ../../samples/display/Makefile.in
../../samples/display/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/display/display.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/display/makefile.bcc -DWXTOPDIR=../../ ../../samples/display/display.bkl
touch ../../samples/display/makefile.bcc
# from ../../samples/notebook/notebook.bkl
../../samples/notebook/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/notebook/notebook.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/notebook/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl
touch ../../samples/notebook/Makefile.in
../../samples/notebook/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/notebook/notebook.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/notebook/makefile.bcc -DWXTOPDIR=../../ ../../samples/notebook/notebook.bkl
touch ../../samples/notebook/makefile.bcc
# from ../../samples/caret/caret.bkl
../../samples/caret/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/caret/caret.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/caret/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl
touch ../../samples/caret/Makefile.in
../../samples/caret/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/caret/caret.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/caret/makefile.bcc -DWXTOPDIR=../../ ../../samples/caret/caret.bkl
touch ../../samples/caret/makefile.bcc
# from ../../samples/erase/erase.bkl
../../samples/erase/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/erase/erase.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/erase/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/erase/erase.bkl
touch ../../samples/erase/Makefile.in
../../samples/erase/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/erase/erase.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/erase/makefile.bcc -DWXTOPDIR=../../ ../../samples/erase/erase.bkl
touch ../../samples/erase/makefile.bcc
# from ../../samples/event/event.bkl
../../samples/event/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/event/event.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/event/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/event/event.bkl
touch ../../samples/event/Makefile.in
../../samples/event/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/event/event.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/event/makefile.bcc -DWXTOPDIR=../../ ../../samples/event/event.bkl
touch ../../samples/event/makefile.bcc
# from ../../samples/image/image.bkl
../../samples/image/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/image/image.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/image/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/image/image.bkl
touch ../../samples/image/Makefile.in
../../samples/image/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/image/image.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/image/makefile.bcc -DWXTOPDIR=../../ ../../samples/image/image.bkl
touch ../../samples/image/makefile.bcc
# from ../../samples/sashtest/sashtest.bkl
../../samples/sashtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/sashtest/sashtest.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sashtest/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl
touch ../../samples/sashtest/Makefile.in
../../samples/sashtest/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/sashtest/sashtest.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/sashtest/makefile.bcc -DWXTOPDIR=../../ ../../samples/sashtest/sashtest.bkl
touch ../../samples/sashtest/makefile.bcc
# from ../../samples/docview/docview.bkl
../../samples/docview/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/docview/docview.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docview/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl
touch ../../samples/docview/Makefile.in
../../samples/docview/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/docview/docview.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/docview/makefile.bcc -DWXTOPDIR=../../ ../../samples/docview/docview.bkl
touch ../../samples/docview/makefile.bcc
# from ../../samples/typetest/typetest.bkl
../../samples/typetest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/typetest/typetest.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/typetest/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl
touch ../../samples/typetest/Makefile.in
../../samples/typetest/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/typetest/typetest.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/typetest/makefile.bcc -DWXTOPDIR=../../ ../../samples/typetest/typetest.bkl
touch ../../samples/typetest/makefile.bcc
# from ../../samples/drawing/drawing.bkl
../../samples/drawing/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/drawing/drawing.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/drawing/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl
touch ../../samples/drawing/Makefile.in
../../samples/drawing/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/drawing/drawing.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/drawing/makefile.bcc -DWXTOPDIR=../../ ../../samples/drawing/drawing.bkl
touch ../../samples/drawing/makefile.bcc
# from ../../samples/splitter/splitter.bkl
../../samples/splitter/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/splitter/splitter.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/splitter/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl
touch ../../samples/splitter/Makefile.in
../../samples/splitter/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/splitter/splitter.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/splitter/makefile.bcc -DWXTOPDIR=../../ ../../samples/splitter/splitter.bkl
touch ../../samples/splitter/makefile.bcc
# from ../../samples/listbox/listbox.bkl
../../samples/listbox/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/listbox/listbox.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listbox/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl
touch ../../samples/listbox/Makefile.in
../../samples/listbox/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/listbox/listbox.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/listbox/makefile.bcc -DWXTOPDIR=../../ ../../samples/listbox/listbox.bkl
touch ../../samples/listbox/makefile.bcc
# from ../../samples/multimon/multimon.bkl
../../samples/multimon/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/multimon/multimon.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/multimon/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl
touch ../../samples/multimon/Makefile.in
../../samples/multimon/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/multimon/multimon.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/multimon/makefile.bcc -DWXTOPDIR=../../ ../../samples/multimon/multimon.bkl
touch ../../samples/multimon/makefile.bcc
# from ../../samples/dynamic/dynamic.bkl
../../samples/dynamic/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dynamic/dynamic.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dynamic/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl
touch ../../samples/dynamic/Makefile.in
../../samples/dynamic/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/dynamic/dynamic.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/dynamic/makefile.bcc -DWXTOPDIR=../../ ../../samples/dynamic/dynamic.bkl
touch ../../samples/dynamic/makefile.bcc
# from ../../samples/checklst/checklst.bkl
../../samples/checklst/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/checklst/checklst.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/checklst/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl
touch ../../samples/checklst/Makefile.in
../../samples/checklst/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/checklst/checklst.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/checklst/makefile.bcc -DWXTOPDIR=../../ ../../samples/checklst/checklst.bkl
touch ../../samples/checklst/makefile.bcc
# from ../../samples/taskbar/taskbar.bkl
../../samples/taskbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/taskbar/taskbar.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/taskbar/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl
touch ../../samples/taskbar/Makefile.in
../../samples/taskbar/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/taskbar/taskbar.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/taskbar/makefile.bcc -DWXTOPDIR=../../ ../../samples/taskbar/taskbar.bkl
touch ../../samples/taskbar/makefile.bcc
# from ../../samples/dragimag/dragimag.bkl
../../samples/dragimag/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dragimag/dragimag.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dragimag/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl
touch ../../samples/dragimag/Makefile.in
../../samples/dragimag/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/dragimag/dragimag.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/dragimag/makefile.bcc -DWXTOPDIR=../../ ../../samples/dragimag/dragimag.bkl
touch ../../samples/dragimag/makefile.bcc
# from ../../samples/sockets/sockets.bkl
../../samples/sockets/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/sockets/sockets.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sockets/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl
touch ../../samples/sockets/Makefile.in
../../samples/sockets/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/sockets/sockets.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/sockets/makefile.bcc -DWXTOPDIR=../../ ../../samples/sockets/sockets.bkl
touch ../../samples/sockets/makefile.bcc
# from ../../samples/calendar/calendar.bkl
../../samples/calendar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/calendar/calendar.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/calendar/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl
touch ../../samples/calendar/Makefile.in
../../samples/calendar/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/calendar/calendar.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/calendar/makefile.bcc -DWXTOPDIR=../../ ../../samples/calendar/calendar.bkl
touch ../../samples/calendar/makefile.bcc
# from ../../samples/minimal/minimal.bkl
../../samples/minimal/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/minimal/minimal.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minimal/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl
touch ../../samples/minimal/Makefile.in
../../samples/minimal/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/minimal/minimal.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/minimal/makefile.bcc -DWXTOPDIR=../../ ../../samples/minimal/minimal.bkl
touch ../../samples/minimal/makefile.bcc
# from ../../samples/access/access.bkl
../../samples/access/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/access/access.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/access/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl
touch ../../samples/access/Makefile.in
../../samples/access/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/access/access.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/access/makefile.bcc -DWXTOPDIR=../../ ../../samples/access/access.bkl
touch ../../samples/access/makefile.bcc
# from ../../samples/statbar/statbar.bkl
../../samples/statbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/statbar/statbar.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/statbar/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl
touch ../../samples/statbar/Makefile.in
../../samples/statbar/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/statbar/statbar.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/statbar/makefile.bcc -DWXTOPDIR=../../ ../../samples/statbar/statbar.bkl
touch ../../samples/statbar/makefile.bcc
# from ../../samples/config/config.bkl
../../samples/config/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/config/config.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/config/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl
touch ../../samples/config/Makefile.in
../../samples/config/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/config/config.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/config/makefile.bcc -DWXTOPDIR=../../ ../../samples/config/config.bkl
touch ../../samples/config/makefile.bcc
# from ../../samples/dialup/dialup.bkl
../../samples/dialup/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dialup/dialup.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialup/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl
touch ../../samples/dialup/Makefile.in
../../samples/dialup/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/dialup/dialup.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/dialup/makefile.bcc -DWXTOPDIR=../../ ../../samples/dialup/dialup.bkl
touch ../../samples/dialup/makefile.bcc
# from ../../samples/controls/controls.bkl
../../samples/controls/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/controls/controls.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/controls/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl
touch ../../samples/controls/Makefile.in
../../samples/controls/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/controls/controls.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/controls/makefile.bcc -DWXTOPDIR=../../ ../../samples/controls/controls.bkl
touch ../../samples/controls/makefile.bcc
# from ../../samples/richedit/richedit.bkl
../../samples/richedit/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/richedit/richedit.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/richedit/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl
touch ../../samples/richedit/Makefile.in
../../samples/richedit/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/richedit/richedit.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/richedit/makefile.bcc -DWXTOPDIR=../../ ../../samples/richedit/richedit.bkl
touch ../../samples/richedit/makefile.bcc
# from ../../samples/newgrid/newgrid.bkl
../../samples/newgrid/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/newgrid/newgrid.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/newgrid/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl
touch ../../samples/newgrid/Makefile.in
../../samples/newgrid/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/newgrid/newgrid.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/newgrid/makefile.bcc -DWXTOPDIR=../../ ../../samples/newgrid/newgrid.bkl
touch ../../samples/newgrid/makefile.bcc
# from ../../samples/toolbar/toolbar.bkl
../../samples/toolbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/toolbar/toolbar.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/toolbar/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl
touch ../../samples/toolbar/Makefile.in
../../samples/toolbar/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/toolbar/toolbar.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/toolbar/makefile.bcc -DWXTOPDIR=../../ ../../samples/toolbar/toolbar.bkl
touch ../../samples/toolbar/makefile.bcc
# from ../../samples/htlbox/htlbox.bkl
../../samples/htlbox/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/htlbox/htlbox.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/htlbox/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl
touch ../../samples/htlbox/Makefile.in
../../samples/htlbox/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/htlbox/htlbox.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/htlbox/makefile.bcc -DWXTOPDIR=../../ ../../samples/htlbox/htlbox.bkl
touch ../../samples/htlbox/makefile.bcc
# from ../../samples/layout/layout.bkl
../../samples/layout/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/layout/layout.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/layout/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/layout/layout.bkl
touch ../../samples/layout/Makefile.in
../../samples/layout/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/layout/layout.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/layout/makefile.bcc -DWXTOPDIR=../../ ../../samples/layout/layout.bkl
touch ../../samples/layout/makefile.bcc
# from ../../samples/minifram/minifram.bkl
../../samples/minifram/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/minifram/minifram.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minifram/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minifram/minifram.bkl
touch ../../samples/minifram/Makefile.in
../../samples/minifram/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/minifram/minifram.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/minifram/makefile.bcc -DWXTOPDIR=../../ ../../samples/minifram/minifram.bkl
touch ../../samples/minifram/makefile.bcc
# from ../../samples/mobile/mobile.bkl
../../samples/mobile/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mobile/mobile.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mobile/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile.bkl
touch ../../samples/mobile/Makefile.in
../../samples/mobile/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/mobile/mobile.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/mobile/makefile.bcc -DWXTOPDIR=../../ ../../samples/mobile/mobile.bkl
touch ../../samples/mobile/makefile.bcc
# from ../../samples/opengl/opengl.bkl
../../samples/opengl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/opengl/opengl.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/opengl/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl.bkl
touch ../../samples/opengl/Makefile.in
../../samples/opengl/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/opengl/opengl.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/opengl/makefile.bcc -DWXTOPDIR=../../ ../../samples/opengl/opengl.bkl
touch ../../samples/opengl/makefile.bcc
# from ../../samples/scroll/scroll.bkl
../../samples/scroll/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/scroll/scroll.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scroll/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl
touch ../../samples/scroll/Makefile.in
../../samples/scroll/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/scroll/scroll.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/scroll/makefile.bcc -DWXTOPDIR=../../ ../../samples/scroll/scroll.bkl
touch ../../samples/scroll/makefile.bcc
# from ../../samples/rotate/rotate.bkl
../../samples/rotate/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/rotate/rotate.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/rotate/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl
touch ../../samples/rotate/Makefile.in
../../samples/rotate/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/rotate/rotate.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/rotate/makefile.bcc -DWXTOPDIR=../../ ../../samples/rotate/rotate.bkl
touch ../../samples/rotate/makefile.bcc
# from ../../samples/shaped/shaped.bkl
../../samples/shaped/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/shaped/shaped.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/shaped/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl
touch ../../samples/shaped/Makefile.in
../../samples/shaped/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/shaped/shaped.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/shaped/makefile.bcc -DWXTOPDIR=../../ ../../samples/shaped/shaped.bkl
touch ../../samples/shaped/makefile.bcc
# from ../../samples/thread/thread.bkl
../../samples/thread/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/thread/thread.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/thread/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl
touch ../../samples/thread/Makefile.in
../../samples/thread/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/thread/thread.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/thread/makefile.bcc -DWXTOPDIR=../../ ../../samples/thread/thread.bkl
touch ../../samples/thread/makefile.bcc
# from ../../samples/wizard/wizard.bkl
../../samples/wizard/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/wizard/wizard.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wizard/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl
touch ../../samples/wizard/Makefile.in
../../samples/wizard/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/wizard/wizard.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/wizard/makefile.bcc -DWXTOPDIR=../../ ../../samples/wizard/wizard.bkl
touch ../../samples/wizard/makefile.bcc
# from ../../samples/printing/printing.bkl
../../samples/printing/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/printing/printing.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/printing/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl
touch ../../samples/printing/Makefile.in
../../samples/printing/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/printing/printing.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/printing/makefile.bcc -DWXTOPDIR=../../ ../../samples/printing/printing.bkl
touch ../../samples/printing/makefile.bcc
# from ../../samples/oleauto/oleauto.bkl
../../samples/oleauto/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/oleauto/oleauto.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/oleauto/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/oleauto/oleauto.bkl
touch ../../samples/oleauto/Makefile.in
../../samples/oleauto/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/oleauto/oleauto.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/oleauto/makefile.bcc -DWXTOPDIR=../../ ../../samples/oleauto/oleauto.bkl
touch ../../samples/oleauto/makefile.bcc
# from ../../samples/wxtest/wxtest.bkl
../../samples/wxtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/wxtest/wxtest.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wxtest/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl
touch ../../samples/wxtest/Makefile.in
../../samples/wxtest/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/wxtest/wxtest.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/wxtest/makefile.bcc -DWXTOPDIR=../../ ../../samples/wxtest/wxtest.bkl
touch ../../samples/wxtest/makefile.bcc
# from ../../samples/artprov/artprov.bkl
../../samples/artprov/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/artprov/artprov.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/artprov/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl
touch ../../samples/artprov/Makefile.in
../../samples/artprov/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/artprov/artprov.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/artprov/makefile.bcc -DWXTOPDIR=../../ ../../samples/artprov/artprov.bkl
touch ../../samples/artprov/makefile.bcc
# from ../../samples/propsize/propsize.bkl
../../samples/propsize/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/propsize/propsize.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/propsize/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl
touch ../../samples/propsize/Makefile.in
../../samples/propsize/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/propsize/propsize.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/propsize/makefile.bcc -DWXTOPDIR=../../ ../../samples/propsize/propsize.bkl
touch ../../samples/propsize/makefile.bcc
# from ../../samples/ownerdrw/ownerdrw.bkl
../../samples/ownerdrw/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/ownerdrw/ownerdrw.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ownerdrw/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ownerdrw/ownerdrw.bkl
touch ../../samples/ownerdrw/Makefile.in
../../samples/ownerdrw/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/ownerdrw/ownerdrw.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/ownerdrw/makefile.bcc -DWXTOPDIR=../../ ../../samples/ownerdrw/ownerdrw.bkl
touch ../../samples/ownerdrw/makefile.bcc
# from ../../samples/vscroll/vscroll.bkl
../../samples/vscroll/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/vscroll/vscroll.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/vscroll/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl
touch ../../samples/vscroll/Makefile.in
../../samples/vscroll/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/vscroll/vscroll.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/vscroll/makefile.bcc -DWXTOPDIR=../../ ../../samples/vscroll/vscroll.bkl
touch ../../samples/vscroll/makefile.bcc
# from ../../samples/validate/validate.bkl
../../samples/validate/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/validate/validate.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/validate/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/validate/validate.bkl
touch ../../samples/validate/Makefile.in
../../samples/validate/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/validate/validate.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/validate/makefile.bcc -DWXTOPDIR=../../ ../../samples/validate/validate.bkl
touch ../../samples/validate/makefile.bcc
# from ../../samples/widgets/widgets.bkl
../../samples/widgets/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/widgets/widgets.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/widgets/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/widgets/widgets.bkl
touch ../../samples/widgets/Makefile.in
../../samples/widgets/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/widgets/widgets.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/widgets/makefile.bcc -DWXTOPDIR=../../ ../../samples/widgets/widgets.bkl
touch ../../samples/widgets/makefile.bcc
# from ../../samples/keyboard/keyboard.bkl
../../samples/keyboard/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/keyboard/keyboard.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/keyboard/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl
touch ../../samples/keyboard/Makefile.in
../../samples/keyboard/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/keyboard/keyboard.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/keyboard/makefile.bcc -DWXTOPDIR=../../ ../../samples/keyboard/keyboard.bkl
touch ../../samples/keyboard/makefile.bcc
# from ../../samples/docvwmdi/docvwmdi.bkl
../../samples/docvwmdi/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/docvwmdi/docvwmdi.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docvwmdi/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl
touch ../../samples/docvwmdi/Makefile.in
../../samples/docvwmdi/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/docvwmdi/docvwmdi.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/docvwmdi/makefile.bcc -DWXTOPDIR=../../ ../../samples/docvwmdi/docvwmdi.bkl
touch ../../samples/docvwmdi/makefile.bcc
# from ../../samples/scrollsub/scrollsub.bkl
../../samples/scrollsub/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/scrollsub/scrollsub.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scrollsub/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl
touch ../../samples/scrollsub/Makefile.in
../../samples/scrollsub/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/scrollsub/scrollsub.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/scrollsub/makefile.bcc -DWXTOPDIR=../../ ../../samples/scrollsub/scrollsub.bkl
touch ../../samples/scrollsub/makefile.bcc
# from ../../samples/memcheck/memcheck.bkl
../../samples/memcheck/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/memcheck/memcheck.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/memcheck/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl
touch ../../samples/memcheck/Makefile.in
../../samples/memcheck/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/memcheck/memcheck.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/memcheck/makefile.bcc -DWXTOPDIR=../../ ../../samples/memcheck/memcheck.bkl
touch ../../samples/memcheck/makefile.bcc
# from ../../samples/internat/internat.bkl
../../samples/internat/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/internat/internat.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/internat/Makefile.in -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl
touch ../../samples/internat/Makefile.in
../../samples/internat/makefile.bcc: common.bkl common_samples.bkl config.bkl ../../samples/internat/internat.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/internat/makefile.bcc -DWXTOPDIR=../../ ../../samples/internat/internat.bkl
touch ../../samples/internat/makefile.bcc
# from ../../contrib/build/xrc/xrc.bkl
../../contrib/src/xrc/Makefile.in: common.bkl common_contrib.bkl config.bkl ../../contrib/build/xrc/xrc.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../contrib/src/xrc/Makefile.in -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
touch ../../contrib/src/xrc/Makefile.in
../../contrib/build/xrc/makefile.bcc: common.bkl common_contrib.bkl config.bkl ../../contrib/build/xrc/xrc.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../contrib/build/xrc/makefile.bcc -DWXTOPDIR=../../../ ../../contrib/build/xrc/xrc.bkl
touch ../../contrib/build/xrc/makefile.bcc
# from ../../contrib/build/gizmos/gizmos.bkl
../../contrib/src/gizmos/Makefile.in: common.bkl common_contrib.bkl config.bkl ../../contrib/build/gizmos/gizmos.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../contrib/src/gizmos/Makefile.in -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/gizmos/gizmos.bkl
touch ../../contrib/src/gizmos/Makefile.in
../../contrib/build/gizmos/makefile.bcc: common.bkl common_contrib.bkl config.bkl ../../contrib/build/gizmos/gizmos.bkl
$(BAKEFILE) $(BAKEARGS) -fborland -o../../contrib/build/gizmos/makefile.bcc -DWXTOPDIR=../../../ ../../contrib/build/gizmos/gizmos.bkl
touch ../../contrib/build/gizmos/makefile.bcc

43
build/bakefiles/README Normal file
View File

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

View File

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

View File

@@ -2,6 +2,8 @@
<!-- $Id$ -->
<makefile>
<requires version="0.1.3"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
@@ -10,7 +12,8 @@
<using module="wxwin"/>
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<!-- ================================================================== -->
<!-- wxWindows version numbers: -->
@@ -19,10 +22,21 @@
<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">$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)</set>
<set var="WX_VERSION" make_var="1">
$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</set>
<set var="WXSOVERSION">0.0.0</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>
<!-- ================================================================== -->
@@ -33,6 +47,10 @@
<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>
@@ -43,12 +61,13 @@
</set>
<set var="VENDORTAG">
<if cond="OFFICIAL_BUILD=='1'"></if>
<if cond="OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
<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'">d</if>
<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>
@@ -65,22 +84,27 @@
</set>
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx</set>
<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">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<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'">wx$(WXVER_MAJOR)$(WXVER_MINOR)</if>
<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)$(WXVER_MAJOR)$(WXVER_MINOR)
wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
</set>
@@ -89,10 +113,6 @@
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
<set var="TOOLCHAIN_NAME">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
</set>
<!-- =============================================================== -->
<!-- Names of component libraries: -->
@@ -101,12 +121,29 @@
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_ADV">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
<set var="WXLIB_XML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
</set>
<set var="WXLIB_ODBC">
<if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
$(mk.evalExpr(wxwin.mkLibName('odbc')))
</if>
</set>
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -114,41 +151,144 @@
<!-- =============================================================== -->
<!-- Where to store built libraries: -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="LIBDIRNAME">
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">
<if cond="FORMAT!='cbuilderx'">$(COMPILER)_$(CFG_NAME_PART)</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf'">$(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)</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="DEBUGFLAG">
<if cond="BUILD=='debug'">on</if>
<if cond="BUILD=='release'">off</if>
<set var="DEBUGINFO">
<if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
<if cond="DEBUG_INFO=='1'">on</if>
<if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
<if cond="DEBUG_INFO=='0'">off</if>
</set>
<set var="DEBUGRUNTIME">
<if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
<if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
</set>
<set var="OPTIMIZEFLAG">
<if cond="BUILD=='debug'">off</if>
<if cond="BUILD=='release'">speed</if>
</set>
<set var="EXCEPTIONSFLAG">
<if cond="USE_EXCEPTIONS=='1'">on</if>
<if cond="USE_EXCEPTIONS=='0'">off</if>
</set>
<set var="DEBUG_DEFINE">
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
</set>
<!-- does not cover all cases, but better than nothing -->
<set var="NO_VC_CRTDBG">
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
<if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
</set>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>multi</threading>
<runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
<cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
<cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<define>$(NO_VC_CRTDBG)</define>
</template>
<template id="anylib">
<depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
<debug-info>$(DEBUGFLAG)</debug-info>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>multi</threading>
</template>
<template id="3rdparty_lib" template="anylib">
<libname>$(id)$(WXDEBUGFLAG)</libname>
<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>
<!-- deal with the need to copy setup.h here: -->
<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>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
</template>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
@@ -161,29 +301,29 @@
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWindows libs: -->
<!-- =============================================================== -->
<template id="wx">
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<include>$(TOP_SRCDIR)include</include>
<define>$(DEBUG_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<!-- this include is added by configure, we need to put other
includes before it: -->
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
<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 cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<warnings>max</warnings>
</template>
<template id="wx_append">
<ldlibs>$(EXTRALIBS)</ldlibs>
<!-- 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>
@@ -191,15 +331,95 @@
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS)</ldlibs>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="FORMAT!='borland'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>comdlg32</sys-lib>
<sys-lib>winspool</sys-lib>
<sys-lib>winmm</sys-lib>
<sys-lib>shell32</sys-lib>
<sys-lib>comctl32</sys-lib>
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<sys-lib>odbc32</sys-lib>
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
<ldlibs>$(EXTRALIBS_GUI)</ldlibs>
</template>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
<precomp-headers>on</precomp-headers>
<precomp-headers-file>wxprec</precomp-headers-file>
<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>
@@ -208,16 +428,122 @@
<mac_version>$(WXMACVERSION)</mac_version>
</template>
<template id="wx_lib" template="wx_lib_b"/>
<template id="wx_dll" template="wx_dll_b" template_append="wx_append"/>
<template id="wx_3rdparty_dependencies">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_3rdparty_includes">
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>
<include>$(INC_EXPAT)</include>
</template>
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_nomono"/>
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>
<!-- =============================================================== -->
<!-- Templates for building wxWindows plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">
$(WXVER_MAJOR).$(WXVER_MINOR)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)
</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">
$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
</if>
<if cond="PLATFORM_UNIX=='0'">
$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
</if>
</set>
</if>
<set var="PLUGVERDELIM">
<if cond="PLATFORM_UNIX=='1'">-</if>
<if cond="PLATFORM_UNIX=='0'"></if>
</set>
<set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
<if cond="UNICODE=='0' and BUILD=='debug'">_d</if>
<if cond="UNICODE=='1' and BUILD=='release'">_u</if>
<if cond="UNICODE=='1' and BUILD=='debug'">_ud</if>
</set>
<set var="PLUGINS_INST_DIR" make_var="1">
$(LIBDIR)/wx/$(PLUGIN_VERSION0)
</set>
<define-rule name="wx-base-plugin" extends="module">
<template>
<dllname>
$(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
$(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll">
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
<!-- A hack to keep autoconf happy (we pass CPPFLAGS that contain
{top_srcdir} from configure, poor bakefile can't know that
and won't output top_srcdir = @top_srcdir@ line): -->
<set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
</makefile>

View File

@@ -1,9 +1,13 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<if cond="not isdefined('file_common_samples_included')">
<include file="common.bkl"/>
</if>
<set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../include</set>
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
@@ -13,15 +17,21 @@
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<if cond="isdefined('file_common_samples_included')">
<template id="wx_contrib_sample" template="wx_sample">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_util" template="wx_util">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
</if>
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
</template>
</makefile>

View File

@@ -1,8 +1,10 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWindows samples: -->
@@ -11,7 +13,7 @@
<if cond="FORMAT=='autoconf'">
<set var="MACOSX_RESOURCES">
<if cond="TOOLKIT=='MAC'">
Carbon.r ../../lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
</if>
</set>
</if>
@@ -20,17 +22,51 @@
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_sample" template="wx">
<template id="wx_util_b" template="wx">
<include>$(SRCDIR)</include>
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<define>$(DLLFLAG)</define>
</template>
<template id="wx_util" template="wx_util_b">
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
<!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
<!-- this include is not added via <include> for autoconf, see
common.bkl: -->
<res-include cond="FORMAT=='autoconf'">
$(TOP_SRCDIR)include
</res-include>
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
<if cond="FORMAT=='autoconf'">
<wx-os2-lib-resource/>
</if>
</template>
<template id="wx_util_console" template="wx_util_b">
<app-type>console</app-type>
</template>
<template id="wx_sample" template="wx_util">
<if cond="FORMAT=='autoconf'">
<wx-mac-app-bundle/>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command>
</if>
</template>
<template id="wx_sample_console" template="wx_util_console">
<if cond="FORMAT=='autoconf'">
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<__command>$(SAMPLES_RPATH_POSTLINK)</__command>
</if>
</template>
<template id="wx_test_console" template="wx_sample_console">
<cppflags>$(CPPUNIT_CFLAGS)</cppflags>
<ldflags>$(CPPUNIT_LIBS)</ldflags>
</template>
<!-- =============================================================== -->
<!-- Support for samples data files: -->
@@ -42,11 +78,44 @@
<dstdir>$(BUILDDIR)</dstdir>
<srcdir>$(SRCDIR)</srcdir>
</template>
<!--
VS - FIXME:
Don't clean the files because it would wipe out sources files if
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
but it would be better to delete the files during "make clean" if
BUILDDIR!=SRCDIR.
<define-tag name="files">
<clean-files>
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
</clean-files>
</define-tag>
-->
</define-rule>
<!-- =============================================================== -->
<!-- Misc platform specialities: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<include file="mac_bundles.bkl"/>
<!--
A hack to include precompiled OS/2 resource file in apps instead of
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
compiler):
-->
<define-tag name="wx-os2-lib-resource" rules="exe">
<set var="os2_lib_res">
<if cond="PLATFORM_OS2=='1'">
$(TOP_SRCDIR)include/wx/os2/wx.res
</if>
</set>
<set var="__objects" append="1">$(os2_lib_res)</set>
</define-tag>
</if>
</makefile>

View File

@@ -5,50 +5,158 @@
<set var="BUILDING_LIB" overwrite="0">0</set>
<option name="UNICODE">
<values>0 1</values>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWindows?
</description>
</option>
<option name="SHARED">
<values>0 1</values>
<default-value>1</default-value>
<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="MONOLITHIC">
<values>0 1</values>
<default-value>1</default-value>
<description>
Multiple libraries or single huge monolithic one?
</description>
</option>
<option name="USE_GUI">
<values>0 1</values>
<default-value>1</default-value>
<description>
Build GUI libraries?
</description>
</option>
<option name="WXUNIV">
<values>0 1</values>
<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>
<set var="MONOLITHIC_DEFAULT">
<if cond="FORMAT=='watcom'">1</if>
<if cond="FORMAT!='watcom'">0</if>
</set>
<option name="MONOLITHIC">
<values>0,1</values>
<values-description>Multilib,Monolithic</values-description>
<default-value>$(MONOLITHIC_DEFAULT)</default-value>
<description>
Multiple libraries or single huge monolithic one?
</description>
</option>
<if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
<option name="USE_PLUGINS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build parts of the library as dynamically loadable plugins
(only supported in multilib build)?
</description>
</option>
</if>
<if cond="FORMAT!='autoconf'">
<set var="USE_PLUGINS">0</set> <!-- FIXME - temporary -->
</if>
<option name="USE_GUI">
<values>0,1</values>
<values-description>Base,GUI</values-description>
<default-value>1</default-value>
<description>
Build GUI libraries?
</description>
</option>
<option name="USE_HTML">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxHTML library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_OPENGL">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build OpenGL canvas library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_ODBC">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build ODBC database classes (USE_GUI must be 1)?
</description>
</option>
<option name="USE_EXCEPTIONS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable exceptions in compiled code.
</description>
</option>
<option name="OFFICIAL_BUILD">
<values>0 1</values>
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWindows developers?
@@ -60,9 +168,34 @@
Use this to name your customized DLLs differently
</description>
</option>
<option name="CFG">
<default-value></default-value>
<description>
Name of your custom configuration. This affects directory
where object files are stored as well as the location of
compiled .lib files and setup.h under the lib/ toplevel directory.
</description>
</option>
<!-- unit tests support: -->
<option name="CPPUNIT_CFLAGS">
<default-value></default-value>
<description>
Compiler flags needed to compile test suite in tests directory. If you want
to run the tests, set it so that the compiler can find CppUnit headers.
</description>
</option>
<option name="CPPUNIT_LIBS">
<default-value></default-value>
<description>
Linker flags needed to link test suite in tests directory. If you want
to run the tests, include CppUnit library here.
</description>
</option>
<!-- ================================================================== -->
<!-- Autoconf -->
<!-- ================================================================== -->
@@ -72,31 +205,134 @@
<option name="TOOLKIT"/>
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>
<option name="TOOLCHAIN_NAME"/>
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
<option name="EXTRALIBS_SDL"/>
<option name="HOST_SUFFIX"/>
<option name="SAMPLES_RPATH_FLAG"/>
<option name="SAMPLES_RPATH_POSTLINK"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<option name="WITH_PLUGIN_SDL">
<values>0,1</values>
</option>
</if>
<!-- ================================================================== -->
<!-- Windows compilers -->
<!-- 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="SAMPLES_RPATH_FLAG"/>
<option name="EXTRALIBS"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
<set var="WITH_PLUGIN_SDL">0</set>
<set var="SRCDIR">
<if cond="BUILDING_LIB=='1'">..</if>
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="BUILDDIR">objs_$(COMPILER)</set>
</if>
<if cond="FORMAT=='mingw'">
<option name="GCC_VERSION">
<values>3,2.95</values>
<default-value>3</default-value>
<description>
Set the version of your Mingw installation here.
"3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
"2.95" ... for Mingw 1.1 or any of the older versions
</description>
</option>
<set var="GCCFLAGS">
<if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
</set>
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
</if>
<if cond="FORMAT=='cbuilderx'">
<set var="EXTRACFLAGS">
<if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
</set>
</if>
<!-- ================================================================== -->
<!-- Project files - hardcode some defaults -->
<!-- ================================================================== -->
<if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
<set var="RUNTIME_LIBS">dynamic</set>
<set var="OFFICIAL_BUILD">0</set>
<set var="USE_HTML">1</set>
<set var="USE_OPENGL">1</set>
<set var="USE_ODBC">1</set>
<set var="MONOLITHIC">0</set>
<set var="USE_GUI">1</set>
<set var="USE_EXCEPTIONS">1</set>
<set var="DEBUG_INFO">default</set>
<set var="DEBUG_FLAG">default</set>
<set var="MSLU">0</set>
</if>
<!-- FIXME:
C++BuilderX supports only wxMSW, monolithic (sic!) static build
and the project can't be put into build/msw and store objects in
build/msw/something. This *must* be fixed! -->
<if cond="FORMAT=='cbuilderx'">
<set var="WXUNIV">0</set>
<set var="MONOLITHIC">1</set>
<set var="SRCDIR">.</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="SHARED">0</set>
</if>
<!-- DigitalMars make is braindead, it doesn't have conditional
processing: -->
<if cond="FORMAT=='dmars'">
<set var="RUNTIME_LIBS">static</set>
<set var="BUILD">debug</set>
<set var="SHARED">0</set>
<set var="WXUNIV">0</set>
<set var="UNICODE">0</set>
</if>
</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-8012 -w-8057 -w-8066</cflags-borland>
<sources>
src/expat/lib/xmlparse.c
src/expat/lib/xmlrole.c
src/expat/lib/xmltok.c
</sources>
</lib>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,28 @@
<?xml version="1.0" ?>
<bakefile-manifest>
<format id="wx24dsp">
<description>
src/wxWindows.dsp which makes same files as 2.4 version
</description>
<default-filename>wxWindows.dsp</default-filename>
</format>
<format id="rpmspec">
<description>
wxBase headers list in wx{GTK,Motif,X11}.spec
</description>
<default-filename>xxx.spec</default-filename>
</format>
<format id="cbx_unix">
<description>
C++BuilderX projects for Unix (use configure)
</description>
<default-filename>
$(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
</default-filename>
</format>
</bakefile-manifest>

View File

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

View File

@@ -0,0 +1,80 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!--
Contains rule definitions that Bakefile requires in every format, implemented
as empty stubs. This is used by our private formats that don't generate real
makefiles, e.g. wx24dsp or rpmspec ones.
-->
<makefile>
<include file="win32.bkl"/>
<set var="CC">cc</set>
<set var="CXX">c++</set>
<set var="CPPFLAGS"/>
<set var="CFLAGS"/>
<set var="CXXFLAGS"/>
<set var="LDFLAGS"/>
<define-rule name="__fake">
<template>
<__fake_hook/>
</template>
<define-tag name="app-type"/>
<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="warnings"/>
<define-tag name="threading"/>
<define-tag name="cxx-rtti"/>
<define-tag name="cxx-exceptions"/>
<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="objects-depend"/>
<define-tag name="sys-lib"/>
<define-tag name="library"/>
<define-tag name="command"/>
<define-tag name="mac-res"/>
<define-tag name="win32-res"/>
<define-tag name="is-phony"/>
<define-tag name="__fake_hook"/>
</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"/>
</makefile>

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="win32.bkl"/>
<set var="COMPILER">vc</set>
<include file="__fake.bkl"/>
<set var="ALL_SOURCES" eval="0">
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
</set>
<output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
<set var="FORMAT_OUTPUT_VARIABLES">
ALL_SOURCES ALL_HEADERS
</set>
</makefile>

View File

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

View File

@@ -8,15 +8,19 @@
<set var="wxUSE_LIBJPEG">builtin</set>
</if>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
</set>
<lib id="wxjpeg" template="3rdparty_lib"
cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
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

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 -sf $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
ln -sf $(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>

1117
build/bakefiles/make_dist.mk Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -2,26 +2,32 @@
<!-- $Id$ -->
<makefile>
<set var="MONOLIB_SRC">
<if cond="USE_GUI=='0'">
src/common/init.cpp $(BASE_SRC) $(BASE_AND_GUI_SRC)
</if>
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
$(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>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll>
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC)</sources>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
</makefile>

View File

@@ -1,43 +1,141 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
<dll id="basedll" template="wx_dll"
<dll id="basedll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL</define>
<define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</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_lib"
<lib id="baselib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</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>WXMAKINGDLL</define>
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<wx-lib>base</wx-lib>
<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) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
</dll>
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" 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>
<!-- ================================================================ -->
@@ -45,16 +143,53 @@
<!-- ================================================================ -->
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL</define>
cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</dll>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
<!-- XML -->
<!-- ================================================================ -->
<dll id="xmldll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XML</define>
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
</dll>
<lib id="xmllib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
</makefile>

View File

@@ -11,10 +11,10 @@
</set>
</if>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ODBC">
<if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
<if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>
</set>
<lib id="wxodbc" template="3rdparty_lib"

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- OpenGL canvas library -->
<!-- ================================================================= -->
<set var="WXLIBGLDEP_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIBGLDEP_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<dll id="gldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GL</define>
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
<!-- link against base and core libs in multilib build: -->
<sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
<sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
<depends>basedll</depends>
<depends>coredll</depends>
<!-- link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
</dll>
<lib id="gllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
</lib>
</makefile>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================ -->
<!-- Unix audio plugins -->
<!-- ================================================================ -->
<wx-base-plugin id="sound_sdl" cond="WITH_PLUGIN_SDL=='1'">
<sources>$(UNIX_SOUND_SRC_SDL)</sources>
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
</wx-base-plugin>
</makefile>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- Additional dependencies of core libraries if plugins are
disabled (these would be deps of the plugins if they were
enabled): -->
<set var="PLUGIN_ADV_EXTRALIBS">
<if cond="USE_PLUGINS=='0'">
$(EXTRALIBS_SDL)
</if>
</set>
<!-- monolithic library must link against all this: -->
<set var="PLUGIN_MONOLIB_EXTRALIBS">$(PLUGIN_ADV_EXTRALIBS)</set>
</makefile>

View File

@@ -8,16 +8,19 @@
<set var="wxUSE_LIBPNG">builtin</set>
</if>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
<if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
</set>
<lib id="wxpng" template="3rdparty_lib"
cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
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

View File

@@ -1,137 +0,0 @@
#!/usr/bin/env python
#
# Generates Makefile that is used to regenerate native makefiles from
# bakefiles.
#
# $Id$
#
import string, os.path
file = open('Makefile', 'wt')
file.write("""
# Generated by regenMakefile.py
BAKEFILE = bakefile
BAKEARGS = -v
""")
lines = []
all = {}
all['autoconf'] = ['../../configure']
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
lines.append('')
lines.append('# from %s' % bake)
def add(bake, makedirs, make, dep, format, args={}):
a = ''
if 'all' in args: a += ' %s' % args['all']
if format in args: a += ' %s' % args[format]
if format in makedirs:
makedir = makedirs[format]
else:
makedir = makedirs['all']
tfile = '%s/%s' % (makedir, make)
lines.append('%s: %s' % (tfile, dep))
lines.append('\t$(BAKEFILE) $(BAKEARGS) -f%s -o%s%s %s' % \
(format, tfile, a, bake))
lines.append('\ttouch %s' % tfile)
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 the makefiles:
# -----------------------------------------------
# main makefile:
addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
['common.bkl', 'config.bkl', 'files.bkl', 'monolithic.bkl',
'multilib.bkl', 'wxwin.py'])
# samples main makefile:
addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
args={'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4'})
CONTRIB_DIR = 1
def onSubmakefile(type, dirname, names):
bakes = [x for x in names if x.endswith('.bkl')]
if len(bakes) == 0: return
depth = dirname.count('/') - 2
if depth <= 0: return
prefix = ''.join(['../' for i in range(0,depth)])
args = {
'all':'-DWXTOPDIR=%s../' % prefix,
'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
}
for bake in bakes:
if type==CONTRIB_DIR:
acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
ruledep = 'common_contrib.bkl'
else:
acdir = dirname
ruledep = 'common_samples.bkl'
addMakefile('%s/%s' % (dirname, bake),
{'all':dirname,'autoconf':acdir},
deps=['common.bkl',ruledep,'config.bkl'],
args=args)
os.path.walk('../../samples', onSubmakefile, None)
os.path.walk('../../contrib/build', onSubmakefile, CONTRIB_DIR)
cleanCmds = ''
for f in all:
for i in all[f]:
cleanCmds += '\trm -f %s\n' % i
for f in all:
var = '%s_ALL' % f.upper()
file.write('%s = %s\n' % (var,' '.join(all[f])))
file.write('all:')
for f in all:
file.write(' %s' % f)
file.write('\n\n')
for f in all:
file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
file.write("""
clean:
\trm -f ../../autoconf_inc.m4
%s
../../autoconf_inc.m4: ../../Makefile.in
../../configure: ../../autoconf_inc.m4
\t(cd ../.. ; aclocal && autoconf)
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)
for l in lines:
file.write('%s\n' % l)
file.close()

View File

@@ -1,4 +1,6 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="FORMAT=='autoconf'">
@@ -8,15 +10,20 @@
<set var="wxUSE_REGEX">builtin</set>
</if>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="3rdparty_lib"
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<libname>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
<sources>
src/regex/regcomp.c
src/regex/regexec.c

View File

@@ -8,21 +8,27 @@
<set var="wxUSE_LIBTIFF">builtin</set>
</if>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
</set>
<set var="TIFF_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
</set>
<lib id="wxtiff" template="3rdparty_lib"
cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include>$(INC_ZLIB)</include>
<include>$(INC_JPEG)</include>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<sources>
$(TIFF_PLATFORM_SRC)
src/tiff/tif_aux.c

View File

@@ -6,26 +6,34 @@
<makefile>
<set var="BUILDING_LIB">1</set>
<!-- 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"/>
<!-- Dynamically loadable plugins: -->
<include file="plugins.bkl"/>
<!-- Samples target (not dependency of 'all'): -->
<!-- [ FIXME disabled; currently causes make install to go into samples ]
<subproject id="samples">
<dir>samples</dir>
<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": -->
@@ -47,9 +55,9 @@
<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)
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(BINDIR)
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
</command>
</action>
@@ -64,6 +72,17 @@
<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>
@@ -72,7 +91,7 @@
<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 ../src/mac/corersrc.r -o $(MACOS_RSRC)
$(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>
@@ -85,6 +104,23 @@
$(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>
@@ -92,18 +128,68 @@
<!-- copy setup.h on Windows: -->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)/wx</dir>
<dir>$(LIBDIRNAME)</dir>
</mkdir>
<copy-file-to-file id="msw/setup.h">
<src>$(SRCDIR)/include/wx/msw/setup0.h</src>
<dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
</copy-file-to-file>
<copy-file-to-file id="setup.h">
<depends>msw/setup.h</depends>
<mkdir id="libdir_setup">
<depends>libdir</depends>
<src>$(SRCDIR)/include/wx/msw/setup.h</src>
<dst>$(LIBDIRNAME)/wx/setup.h</dst>
</copy-file-to-file>
<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>
<include file="build_cfg.bkl"/>
</makefile>

View File

@@ -5,6 +5,20 @@
#
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
@@ -17,19 +31,32 @@ def mk_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_BASE = ['base']
LIBS_GUI = ['core', 'html']
LIBS_NOGUI = ['xml', 'net', 'odbc']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',
'xml' : '$(EXTRALIBS_XML)',
'html' : '$(EXTRALIBS_HTML)',
'odbc' : '$(EXTRALIBS_ODBC)',
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
}
def mkLibName(wxid):
"""Returns string that can be used as library name, including name
suffixes, prefixes, version tags etc. This must be kept in sync
with variables defined in common.bkl!"""
if wxid == 'mono':
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)'
if wxid in LIBS_BASE:
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
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
@@ -37,18 +64,30 @@ def mkDllName(wxid):
with variables defined in common.bkl!"""
if wxid == 'mono':
return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
if wxid in LIBS_BASE:
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'.
libToLink('foo') returns '$(WXLIB_FOO)' which must be defined in
common.bkl as either nothing (in monolithic build) or mkLibName('foo')
(otherwise)."""
return '$(WXLIB_%s)' % wxlibname.upper()
For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which
must be defined in common.bkl as either nothing (in monolithic build) or
mkLibName('foo') (otherwise).
For contrib libraries, it returns mkDllName(wxlibname).
"""
if wxlibname in MAIN_LIBS:
return '$(WXLIB_%s)' % wxlibname.upper()
else:
return mkLibName(wxlibname)
def extraLdflags(wxlibname):
if wxlibname in EXTRALIBS:
return EXTRALIBS[wxlibname]
else:
return ''
wxVersion = None
VERSION_FILE = '../../include/wx/version.h'
@@ -83,3 +122,25 @@ def getVersionMinor():
return getVersion()[1]
def getVersionRelease():
return getVersion()[2]
def headersOnly(files):
"""Filters 'files' so that only headers are left. Used with
<msvc-project-files> to add headers to VC++ projects but not files such
as arrimpl.cpp."""
def callback(cond, sources):
prf = suf = ''
if sources[0].isspace(): prf=' '
if sources[-1].isspace(): suf=' '
retval = []
for s in sources.split():
if s.endswith('.h'):
retval.append(s)
return '%s%s%s' % (prf, ' '.join(retval), suf)
return utils.substitute2(files, callback)
def makeDspDependency(lib):
"""Returns suitable entry for <depends-on-dsp> for main libs."""
return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)

View File

@@ -8,15 +8,16 @@
<set var="wxUSE_ZLIB">builtin</set>
</if>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
<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

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

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

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

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

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

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

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

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

9377
build/msw/makefile.bcc Normal file

File diff suppressed because it is too large Load Diff

9824
build/msw/makefile.gcc Normal file

File diff suppressed because it is too large Load Diff

9935
build/msw/makefile.vc Normal file

File diff suppressed because it is too large Load Diff

10010
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: "wxregex"=wx_wxregex.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxzlib"=wx_wxzlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxpng"=wx_wxpng.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxjpeg"=wx_wxjpeg.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxtiff"=wx_wxtiff.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxexpat"=wx_wxexpat.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "base"=wx_base.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "net"=wx_net.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "core"=wx_core.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "adv"=wx_adv.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "html"=wx_html.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "xml"=wx_xml.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "gl"=wx_gl.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################

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

1339
build/msw/wx_base.dsp Normal file

File diff suppressed because it is too large Load Diff

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

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

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

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

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

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

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

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

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 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxpng - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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"
!ENDIF
# Begin Target
# Name "wxpng - Win32 DLL Universal Unicode Release"
# Name "wxpng - Win32 DLL Universal Unicode Debug"
# Name "wxpng - Win32 DLL Universal Release"
# Name "wxpng - Win32 DLL Universal Debug"
# Name "wxpng - Win32 DLL Unicode Release"
# Name "wxpng - Win32 DLL Unicode Debug"
# Name "wxpng - Win32 DLL Release"
# Name "wxpng - Win32 DLL Debug"
# Name "wxpng - Win32 Universal Unicode Release"
# Name "wxpng - Win32 Universal Unicode Debug"
# Name "wxpng - Win32 Universal Release"
# Name "wxpng - Win32 Universal Debug"
# Name "wxpng - Win32 Unicode Release"
# Name "wxpng - Win32 Unicode Debug"
# Name "wxpng - Win32 Release"
# Name "wxpng - Win32 Debug"
# 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

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

@@ -0,0 +1,626 @@
# 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 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxregex - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxregex - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /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 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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /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 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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.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 /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /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 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 /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /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"
!ENDIF
# Begin Target
# Name "wxregex - Win32 DLL Universal Unicode Release"
# Name "wxregex - Win32 DLL Universal Unicode Debug"
# Name "wxregex - Win32 DLL Universal Release"
# Name "wxregex - Win32 DLL Universal Debug"
# Name "wxregex - Win32 DLL Unicode Release"
# Name "wxregex - Win32 DLL Unicode Debug"
# Name "wxregex - Win32 DLL Release"
# Name "wxregex - Win32 DLL Debug"
# Name "wxregex - Win32 Universal Unicode Release"
# Name "wxregex - Win32 Universal Unicode Debug"
# Name "wxregex - Win32 Universal Release"
# Name "wxregex - Win32 Universal Debug"
# Name "wxregex - Win32 Unicode Release"
# Name "wxregex - Win32 Unicode Debug"
# Name "wxregex - Win32 Release"
# Name "wxregex - Win32 Debug"
# 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
# Begin Group "Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# 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 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxtiff - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxtiff - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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"
!ENDIF
# Begin Target
# Name "wxtiff - Win32 DLL Universal Unicode Release"
# Name "wxtiff - Win32 DLL Universal Unicode Debug"
# Name "wxtiff - Win32 DLL Universal Release"
# Name "wxtiff - Win32 DLL Universal Debug"
# Name "wxtiff - Win32 DLL Unicode Release"
# Name "wxtiff - Win32 DLL Unicode Debug"
# Name "wxtiff - Win32 DLL Release"
# Name "wxtiff - Win32 DLL Debug"
# Name "wxtiff - Win32 Universal Unicode Release"
# Name "wxtiff - Win32 Universal Unicode Debug"
# Name "wxtiff - Win32 Universal Release"
# Name "wxtiff - Win32 Universal Debug"
# Name "wxtiff - Win32 Unicode Release"
# Name "wxtiff - Win32 Unicode Debug"
# Name "wxtiff - Win32 Release"
# Name "wxtiff - Win32 Debug"
# 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 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxzlib - Win32 DLL Universal Unicode 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 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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 /GR /GX /MD /W1 /O1 /GR /GX /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
# ADD CPP /nologo /FD /GR /GX /MD /W1 /O1 /GR /GX /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 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 /GR /GX /MDd /W1 /Od /GR /GX /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
# ADD CPP /nologo /FD /GR /GX /MDd /W1 /Od /GR /GX /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"
!ENDIF
# Begin Target
# Name "wxzlib - Win32 DLL Universal Unicode Release"
# Name "wxzlib - Win32 DLL Universal Unicode Debug"
# Name "wxzlib - Win32 DLL Universal Release"
# Name "wxzlib - Win32 DLL Universal Debug"
# Name "wxzlib - Win32 DLL Unicode Release"
# Name "wxzlib - Win32 DLL Unicode Debug"
# Name "wxzlib - Win32 DLL Release"
# Name "wxzlib - Win32 DLL Debug"
# Name "wxzlib - Win32 Universal Unicode Release"
# Name "wxzlib - Win32 Universal Unicode Debug"
# Name "wxzlib - Win32 Universal Release"
# Name "wxzlib - Win32 Universal Debug"
# Name "wxzlib - Win32 Unicode Release"
# Name "wxzlib - Win32 Unicode Debug"
# Name "wxzlib - Win32 Release"
# Name "wxzlib - Win32 Debug"
# 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 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wx_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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251u_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251u_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251ud_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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug
!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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /D wxUSE_GUI=0 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "xml - Win32 DLL Universal Unicode Release"
# Name "xml - Win32 DLL Universal Unicode Debug"
# Name "xml - Win32 DLL Universal Release"
# Name "xml - Win32 DLL Universal Debug"
# Name "xml - Win32 DLL Unicode Release"
# Name "xml - Win32 DLL Unicode Debug"
# Name "xml - Win32 DLL Release"
# Name "xml - Win32 DLL Debug"
# Name "xml - Win32 Universal Unicode Release"
# Name "xml - Win32 Universal Unicode Debug"
# Name "xml - Win32 Universal Release"
# Name "xml - Win32 Universal Debug"
# Name "xml - Win32 Unicode Release"
# Name "xml - Win32 Unicode Debug"
# Name "xml - Win32 Release"
# Name "xml - Win32 Debug"
# 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 DLL Universal Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "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 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 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 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 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 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 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 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 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 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 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 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 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 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 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\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

214
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, 2002 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2002-11-30'
timestamp='2004-01-05'
# 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
@@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
# This shell variable is my proudest work .. or something. --bje
# Portable tmp directory creation inspired by the Autoconf team.
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 ;
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
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 ;
unset files'
esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -219,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pegasos:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -238,68 +243,52 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
fi
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
# types through head -n 1, so we only detect the type of CPU 0.
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
UNAME_MACHINE="alpha" ;;
"EV4.5 (21064)")
UNAME_MACHINE="alpha" ;;
"LCA4 (21066/21068)")
UNAME_MACHINE="alpha" ;;
"EV5 (21164)")
UNAME_MACHINE="alphaev5" ;;
"EV5.6 (21164A)")
UNAME_MACHINE="alphaev56" ;;
"EV5.6 (21164PC)")
UNAME_MACHINE="alphapca56" ;;
"EV5.7 (21164PC)")
UNAME_MACHINE="alphapca57" ;;
"EV6 (21264)")
UNAME_MACHINE="alphaev6" ;;
"EV6.7 (21264A)")
UNAME_MACHINE="alphaev67" ;;
"EV6.8CB (21264C)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8AL (21264B)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8CX (21264D)")
UNAME_MACHINE="alphaev68" ;;
"EV6.9A (21264/EV69A)")
UNAME_MACHINE="alphaev69" ;;
"EV7 (21364)")
UNAME_MACHINE="alphaev7" ;;
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
# A Vn.n version is a released version.
# 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:
.byte 37,100,45,37,120,10,0 # "%d-%x\n"
.text
.globl main
.align 4
.ent main
main:
.frame \$30,16,\$26,0
ldgp \$29,0(\$27)
.prologue 1
.long 0x47e03d80 # implver \$0
lda \$2,-1
.long 0x47e20c21 # amask \$2,\$1
lda \$16,\$Lformat
mov \$0,\$17
not \$1,\$18
jsr \$26,printf
ldgp \$29,0(\$26)
mov 0,\$16
jsr \$26,exit
.end main
EOF
$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
if test "$?" = 0 ; then
case `$dummy` in
0-0)
UNAME_MACHINE="alpha"
;;
1-0)
UNAME_MACHINE="alphaev5"
;;
1-1)
UNAME_MACHINE="alphaev56"
;;
1-101)
UNAME_MACHINE="alphapca56"
;;
2-303)
UNAME_MACHINE="alphaev6"
;;
2-307)
UNAME_MACHINE="alphaev67"
;;
2-1307)
UNAME_MACHINE="alphaev68"
;;
3-1307)
UNAME_MACHINE="alphaev7"
;;
esac
fi
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*:OpenVMS:*:*)
echo alpha-hp-vms
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -321,6 +310,9 @@ EOF
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
@@ -338,6 +330,9 @@ EOF
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -450,8 +445,7 @@ EOF
EOF
$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
&& exit 0
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Motorola:PowerMAX_OS:*:*)
@@ -535,8 +529,7 @@ EOF
exit(0);
}
EOF
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -635,10 +628,20 @@ EOF
}
EOF
(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
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
# avoid double evaluation of $set_cc_for_build
test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
HP_ARCH="hppa64"
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
ia64:HP-UX:*:*)
@@ -672,8 +675,7 @@ EOF
exit (0);
}
EOF
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
rm -f $dummy.c $dummy && rmdir $tmpdir
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -731,21 +733,26 @@ EOF
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*T3D:*:*:*)
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
*:UNICOS/mp:*:*)
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
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 ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -767,8 +774,10 @@ EOF
#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}
# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
# FreeBSD's kernel, but not the complete OS.
case ${LIBC} in gnu) kernel_only='k' ;; esac
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +788,8 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
x86:Interix*:3*)
echo i586-pc-interix3
x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
exit 0 ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -801,14 +810,22 @@ EOF
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit 0 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -832,7 +849,6 @@ EOF
#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:*:*)
@@ -852,7 +868,6 @@ EOF
#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:*:*)
@@ -889,6 +904,9 @@ EOF
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -946,9 +964,11 @@ EOF
LIBC=gnuaout
#endif
#endif
#ifdef __dietlibc__
LIBC=dietlibc
#endif
EOF
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
;;
@@ -977,6 +997,9 @@ EOF
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1048,7 +1071,7 @@ EOF
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 | 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)
3[345]??:*: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 | SHG2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1146,7 +1169,11 @@ EOF
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
echo `uname -p`-apple-darwin${UNAME_RELEASE}
case `uname -p` in
*86) UNAME_PROCESSOR=i686 ;;
powerpc) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1159,7 +1186,7 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1200,6 +1227,12 @@ EOF
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;;
*:DRAGONFLY:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1320,8 +1353,7 @@ main ()
}
EOF
$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
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.

340
config.sub vendored
View File

@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# 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, 2003 Free Software Foundation, Inc.
timestamp='2001-09-07'
timestamp='2004-01-05'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-07'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -226,32 +228,46 @@ case $basic_machine in
1750a | 580 \
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \
| d10v | d30v | dsp16xx \
| fr30 \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32r | m68000 | m68k | m88k | mcore \
| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el | mips64vr4300 \
| mips64vr4300el | mips64vr5000 | mips64vr5000el \
| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
| mipsisa32 \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
| mips64vr | mips64vrel \
| mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| msp430 \
| ns16k | ns32k \
| openrisc \
| openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| s390 | s390x \
| sh | sh[34] | sh[34]eb | shbe | shle \
| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
| stormy16 | strongarm \
| tahoe | thumb | tic80 | tron \
| v850 \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale \
| x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -278,38 +294,56 @@ case $basic_machine in
580-* \
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alphapca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armv*-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c54x-* \
| clipper-* | cray2-* | cydra-* \
| d10v-* | d30v-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | fx80-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| m32r-* \
| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
| mips64vr-* | mips64vrel-* \
| mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| msp430-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
| s390-* | s390x-* \
| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
| v850-* | vax-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
| xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -343,6 +377,12 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
amd64)
basic_machine=x86_64-pc
;;
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -374,6 +414,10 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
c90)
basic_machine=c90-cray
os=-unicos
;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -394,16 +438,8 @@ case $basic_machine in
basic_machine=c38-convex
os=-bsd
;;
cray | ymp)
basic_machine=ymp-cray
os=-unicos
;;
cray2)
basic_machine=cray2-cray
os=-unicos
;;
[cjt]90)
basic_machine=${basic_machine}-cray
cray | j90)
basic_machine=j90-cray
os=-unicos
;;
crds | unos)
@@ -418,6 +454,14 @@ case $basic_machine in
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=-tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
os=-tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -598,14 +642,6 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
;;
mips*-linux*)
basic_machine=mips-unknown
os=-linux-gnu
;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -620,6 +656,10 @@ case $basic_machine in
basic_machine=m68k-rom68k
os=-coff
;;
morphos)
basic_machine=powerpc-unknown
os=-morphos
;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -692,6 +732,10 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -699,6 +743,14 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
or32 | or32-*)
basic_machine=or32-unknown
os=-coff
;;
os400)
basic_machine=powerpc-ibm
os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -721,49 +773,55 @@ case $basic_machine in
pbb)
basic_machine=m68k-tti
;;
pc532 | pc532-*)
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pentium | p5 | k5 | k6 | nexgen)
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
pentiumpro | p6 | 6x86 | athlon)
pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
pentiumii | pentium2)
pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-*)
pentium4)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium4-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
;;
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
;;
;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
;;
;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
;;
;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -784,10 +842,26 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
s390 | s390-*)
basic_machine=s390-ibm
;;
s390x | s390x-*)
basic_machine=s390x-ibm
;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
sb1)
basic_machine=mipsisa64sb1-unknown
;;
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sei)
basic_machine=mips-sei
os=-seiux
;;
sequent)
basic_machine=i386-sequent
;;
@@ -795,7 +869,10 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sparclite-wrs)
sh64)
basic_machine=sh64-unknown
;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -862,22 +939,42 @@ case $basic_machine in
os=-dynix
;;
t3e)
basic_machine=t3e-cray
basic_machine=alphaev5-cray
os=-unicos
;;
t90)
basic_machine=t90-cray
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
tic55x | c55x*)
basic_machine=tic55x-unknown
os=-coff
;;
tic6x | c6x*)
basic_machine=tic6x-unknown
os=-coff
;;
tx39)
basic_machine=mipstx39-unknown
;;
tx39el)
basic_machine=mipstx39el-unknown
;;
toad1)
basic_machine=pdp10-xkl
os=-tops20
;;
tower | tower-32)
basic_machine=m68k-ncr
;;
tpf)
basic_machine=s390x-ibm
os=-tpf
;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -899,8 +996,8 @@ case $basic_machine in
os=-vms
;;
vpp*|vx|vx-*)
basic_machine=f301-fujitsu
;;
basic_machine=f301-fujitsu
;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -921,17 +1018,13 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
windows32)
basic_machine=i386-pc
os=-windows32-msvcrt
;;
xmp)
basic_machine=xmp-cray
os=-unicos
;;
xps | xps100)
xps | xps100)
basic_machine=xps100-honeywell
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -952,13 +1045,6 @@ case $basic_machine in
op60c)
basic_machine=hppa1.1-oki
;;
mips)
if [ x$os = x-linux-gnu ]; then
basic_machine=mips-unknown
else
basic_machine=mips-mips
fi
;;
romp)
basic_machine=romp-ibm
;;
@@ -978,13 +1064,16 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sh3 | sh4 | sh3eb | sh4eb)
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -999,10 +1088,6 @@ case $basic_machine in
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1058,17 +1143,19 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos*)
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1080,8 +1167,10 @@ case $os in
;;
esac
;;
-nto-qnx*)
;;
-nto*)
os=-nto-qnx
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1090,6 +1179,9 @@ case $os in
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1102,6 +1194,9 @@ case $os in
-opened*)
os=-openedition
;;
-os400*)
os=-os400
;;
-wince*)
os=-wince
;;
@@ -1120,14 +1215,23 @@ case $os in
-acis*)
os=-aos
;;
-atheos*)
os=-atheos
;;
-syllable*)
os=-syllable
;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
-nova*)
os=-rtmk-nova
;;
-ns2 )
os=-nextstep2
os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1139,6 +1243,9 @@ case $os in
-sinix*)
os=-sysv4
;;
-tpf*)
os=-tpf
;;
-triton*)
os=-sysv3
;;
@@ -1166,8 +1273,14 @@ case $os in
-xenix)
os=-xenix
;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;;
-none)
;;
@@ -1200,10 +1313,14 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
pdp11-*)
pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1230,6 +1347,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
or32-*)
os=-coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1293,19 +1413,19 @@ case $basic_machine in
*-next)
os=-nextstep3
;;
*-gould)
*-gould)
os=-sysv
;;
*-highlevel)
*-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
*-sgi)
*-sgi)
os=-irix
;;
*-siemens)
*-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1374,10 +1494,16 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
-os400*)
vendor=ibm
;;
-ptx*)
vendor=sequent
;;
-vxsim* | -vxworks*)
-tpf*)
vendor=ibm
;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)

15421
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,466 @@
# 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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "animate - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "animate - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "animate - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251_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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmswuniv251d_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw251d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_dll" /implib:"..\..\src\animate\..\..\..\lib\vc_dll\wxmsw25d_animate.lib" /debug
!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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswuniv" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswuniv" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswunivd" /W4 /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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_animate.lib"
# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_lib\wxmsw25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\msw" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\msw" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "animate - Win32 DLL Universal Unicode Release"
# Name "animate - Win32 DLL Universal Unicode Debug"
# Name "animate - Win32 DLL Universal Release"
# Name "animate - Win32 DLL Universal Debug"
# Name "animate - Win32 DLL Unicode Release"
# Name "animate - Win32 DLL Unicode Debug"
# Name "animate - Win32 DLL Release"
# Name "animate - Win32 DLL Debug"
# Name "animate - Win32 Universal Unicode Release"
# Name "animate - Win32 Universal Unicode Debug"
# Name "animate - Win32 Universal Release"
# Name "animate - Win32 Universal Debug"
# Name "animate - Win32 Unicode Release"
# Name "animate - Win32 Unicode Debug"
# Name "animate - Win32 Release"
# Name "animate - Win32 Debug"
# 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,201 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
.autodepend
!ifndef BCCDIR
!ifndef MAKEDIR
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANIMATEDLL_CXXFLAGS = $(__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 -Hu \
-H=$(OBJS)\wxprec_animatedll.csm $(CPPFLAGS) $(CXXFLAGS)
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.obj \
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = $(__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 -Hu -H=$(OBJS)\wxprec_animatelib.csm \
$(CPPFLAGS) $(CXXFLAGS)
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.obj \
$(OBJS)\animatelib_animate.obj
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__animatelib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!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"
__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 "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).tds
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ilc
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ild
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ilf
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).ils
-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
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 /p4096 $@ @&&|
$(ANIMATELIB_OBJECTS)
|
!endif
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) $**

View File

@@ -0,0 +1,195 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANIMATEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-Wall -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.o \
$(OBJS)\animatedll_animate.o
ANIMATELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
-Wall -I..\..\src\animate\..\..\include $(__EXCEPTIONSFLAG) \
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.o \
$(OBJS)\animatelib_animate.o
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
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 ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(SHARED),1)
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(SHARED),0)
__animatelib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
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)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG = -fno-rtti
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG =
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG_0 = -fno-exceptions
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG_0 =
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
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 ($(UNICODE),1)
__UNICODE_DEFINE_p = -D_UNICODE
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\gcc_dll$(CFG)
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__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
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $<
.PHONY: all clean

View File

@@ -0,0 +1,280 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANIMATEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE \
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_animatedll.pch" $(CPPFLAGS) $(CXXFLAGS)
ANIMATEDLL_OBJECTS = \
$(OBJS)\animatedll_dummy.obj \
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb \
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\animate\..\..\include $(__EXCEPTIONSFLAG) \
$(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatelib.pch" \
$(CPPFLAGS) $(CXXFLAGS)
ANIMATELIB_OBJECTS = \
$(OBJS)\animatelib_dummy.obj \
$(OBJS)\animatelib_animate.obj
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__animatedll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll
!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 "$(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 "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__animatelib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_14_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_14_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_14_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_15 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_15 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_15 = $(__DEBUGINFO_2)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = /Zi
!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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = d
!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 "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG = /GR
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG_0 =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG_0 = /GX
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__animatedll___depname) $(__animatelib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb
-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
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(__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
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) $**

View File

@@ -0,0 +1,255 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
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
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
__animatedll___depname =
!ifeq SHARED 1
__animatedll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
!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
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!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
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__animatelib___depname =
!ifeq SHARED 0
__animatelib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
!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
__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
__EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 0
__EXCEPTIONSFLAG =
!endif
!ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG = -xs
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!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
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -d_UNICODE
!endif
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_dll$(CFG)
!endif
### Variables: ###
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
ANIMATEDLL_CXXFLAGS = -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 &
/fh=$(OBJS)\wxprec_animatedll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
$(CXXFLAGS)
ANIMATEDLL_OBJECTS = &
$(OBJS)\animatedll_dummy.obj &
$(OBJS)\animatedll_animate.obj
ANIMATELIB_CXXFLAGS = $(__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 /fh=$(OBJS)\wxprec_animatelib.pch &
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
ANIMATELIB_OBJECTS = &
$(OBJS)\animatelib_dummy.obj &
$(OBJS)\animatelib_animate.obj
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__animatedll___depname) $(__animatelib___depname)
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)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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 -p4096 -n -b $^@ @$(OBJS)\animatelib.lbc
!endif
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<

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,494 @@
# 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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "deprecated - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "deprecated - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "deprecated - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251ud_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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251_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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv251d_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251ud_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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw251d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw25d_deprecated.lib" /debug
!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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /W4 /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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.lib"
# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "deprecated - Win32 DLL Universal Unicode Release"
# Name "deprecated - Win32 DLL Universal Unicode Debug"
# Name "deprecated - Win32 DLL Universal Release"
# Name "deprecated - Win32 DLL Universal Debug"
# Name "deprecated - Win32 DLL Unicode Release"
# Name "deprecated - Win32 DLL Unicode Debug"
# Name "deprecated - Win32 DLL Release"
# Name "deprecated - Win32 DLL Debug"
# Name "deprecated - Win32 Universal Unicode Release"
# Name "deprecated - Win32 Universal Unicode Debug"
# Name "deprecated - Win32 Universal Release"
# Name "deprecated - Win32 Universal Debug"
# Name "deprecated - Win32 Unicode Release"
# Name "deprecated - Win32 Unicode Debug"
# Name "deprecated - Win32 Release"
# Name "deprecated - Win32 Debug"
# 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,268 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
.autodepend
!ifndef BCCDIR
!ifndef MAKEDIR
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEPRECATEDDLL_CFLAGS = $(__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 $(CPPFLAGS) $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(__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 -Hu \
-H=$(OBJS)\wxprec_deprecateddll.csm $(CPPFLAGS) $(CXXFLAGS)
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 = $(__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 \
$(CPPFLAGS) $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(__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 \
-Hu -H=$(OBJS)\wxprec_deprecatedlib.csm $(CPPFLAGS) $(CXXFLAGS)
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
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__deprecatedlib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!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"
__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 "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).tds
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilc
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ild
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilf
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ils
-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)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 /p4096 $@ @&&|
$(DEPRECATEDLIB_OBJECTS)
|
!endif
$(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)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_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) $**
$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDLIB_CFLAGS) $**

View File

@@ -0,0 +1,263 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEPRECATEDDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
-DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
-DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(__EXCEPTIONSFLAG) \
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include \
-I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include \
-I..\..\src\deprecated $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
$(CPPFLAGS) $(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
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
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 ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(SHARED),1)
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(SHARED),0)
__deprecatedlib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
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)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG = -fno-rtti
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG =
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG_0 = -fno-exceptions
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG_0 =
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
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 ($(UNICODE),1)
__UNICODE_DEFINE_p = -D_UNICODE
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_dll$(CFG)
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__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
$(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)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDDLL_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) $<
$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $<
.PHONY: all clean

View File

@@ -0,0 +1,353 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEPRECATEDDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
/I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
/I..\..\src\deprecated $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecateddll.pch" $(CPPFLAGS) \
$(CXXFLAGS)
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 = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CPPFLAGS) \
$(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated \
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_deprecatedlib.pch" $(CPPFLAGS) $(CXXFLAGS)
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
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__deprecateddll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll
!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 "$(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 "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__deprecatedlib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_14_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_14_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_14_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_15 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_15 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_15 = $(__DEBUGINFO_2)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = /Zi
!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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = d
!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 "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG = /GR
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG_0 =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG_0 = /GX
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb
-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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(__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
$(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)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_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) $**
$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDLIB_CFLAGS) $**

View File

@@ -0,0 +1,323 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
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
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
__deprecateddll___depname =
!ifeq SHARED 1
__deprecateddll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
!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
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!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
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__deprecatedlib___depname =
!ifeq SHARED 0
__deprecatedlib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
!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
__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
__EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 0
__EXCEPTIONSFLAG =
!endif
!ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG = -xs
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!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
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -d_UNICODE
!endif
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_dll$(CFG)
!endif
### Variables: ###
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
DEPRECATEDDLL_CFLAGS = -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 $(CPPFLAGS) $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = -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 &
/fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
$(CXXFLAGS)
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 = $(__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 $(CPPFLAGS) &
$(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(__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 &
/fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
$(CXXFLAGS)
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
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__deprecateddll___depname) $(__deprecatedlib___depname)
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)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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 -p4096 -n -b $^@ @$(OBJS)\deprecatedlib.lbc
!endif
$(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)\deprecateddll_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -zq -fo=$^@ $(DEPRECATEDDLL_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) $<
$(OBJS)\deprecatedlib_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<

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>

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

@@ -0,0 +1,530 @@
# 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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "fl - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "fl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "fl - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251_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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv251d_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw251d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw25d_fl.lib" /debug
!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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /W4 /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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_fl.lib"
# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "fl - Win32 DLL Universal Unicode Release"
# Name "fl - Win32 DLL Universal Unicode Debug"
# Name "fl - Win32 DLL Universal Release"
# Name "fl - Win32 DLL Universal Debug"
# Name "fl - Win32 DLL Unicode Release"
# Name "fl - Win32 DLL Unicode Debug"
# Name "fl - Win32 DLL Release"
# Name "fl - Win32 DLL Debug"
# Name "fl - Win32 Universal Unicode Release"
# Name "fl - Win32 Universal Unicode Debug"
# Name "fl - Win32 Universal Release"
# Name "fl - Win32 Universal Debug"
# Name "fl - Win32 Unicode Release"
# Name "fl - Win32 Unicode Debug"
# Name "fl - Win32 Release"
# Name "fl - Win32 Debug"
# 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,329 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
.autodepend
!ifndef BCCDIR
!ifndef MAKEDIR
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
!endif
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FLDLL_CXXFLAGS = $(__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 -Hu \
-H=$(OBJS)\wxprec_fldll.csm $(CPPFLAGS) $(CXXFLAGS)
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 = $(__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 -Hu -H=$(OBJS)\wxprec_fllib.csm $(CPPFLAGS) \
$(CXXFLAGS)
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
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_7 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__fllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!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"
__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 "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).tds
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilc
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ild
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilf
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ils
-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)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 /p4096 $@ @&&|
$(FLLIB_OBJECTS)
|
!endif
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
$(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_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_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
$(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_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) $**

View File

@@ -0,0 +1,323 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
-I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
$(CPPFLAGS) $(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
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
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 ($(UNICODE),1)
WXUNICODEFLAG = u
endif
ifeq ($(WXUNIV),1)
WXUNIVNAME = univ
endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(SHARED),1)
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll
endif
ifeq ($(MONOLITHIC),1)
__WXLIB_MONO_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif
ifeq ($(USE_GUI),1)
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
ifeq ($(SHARED),0)
__fllib___depname = \
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
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)
__OPTIMIZEFLAG = -O0
endif
ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG = -fno-rtti
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG =
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG_0 = -fno-exceptions
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG_0 =
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
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 ($(UNICODE),1)
__UNICODE_DEFINE_p = -D_UNICODE
endif
ifeq ($(SHARED),0)
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_dll$(CFG)
endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__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
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
$(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_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_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(FLLIB_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_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) $<
.PHONY: all clean

View File

@@ -0,0 +1,406 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_fldll.pch" $(CPPFLAGS) $(CXXFLAGS)
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 = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
/I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" $(CPPFLAGS) $(CXXFLAGS)
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
### Conditionally set variables: ###
!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 "$(UNICODE)" == "1"
WXUNICODEFLAG = u
!endif
!if "$(WXUNIV)" == "1"
WXUNIVNAME = univ
!endif
!if "$(SHARED)" == "1"
WXDLLFLAG = dll
!endif
!if "$(SHARED)" == "1"
__fldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
!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 "$(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 "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_3 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_3 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(MSLU)" == "1"
__UNICOWS_LIB_p = unicows.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
!if "$(SHARED)" == "0"
__fllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_14_p =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_14_p = /D_DEBUG
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_14_p = $(____DEBUGINFO)
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_15 =
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_15 = d
!endif
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_15 = $(__DEBUGINFO_2)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = /Zi
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO = /Zi
!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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = d
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = d
!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 "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG = /GR
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONSFLAG_0 =
!endif
!if "$(USE_EXCEPTIONS)" == "1"
__EXCEPTIONSFLAG_0 = /GX
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /D_UNICODE
!endif
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_dll$(CFG)
!endif
all: $(OBJS)
$(OBJS):
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all: $(__fldll___depname) $(__fllib___depname)
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb
-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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(__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
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(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_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_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(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_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) $**

View File

@@ -0,0 +1,382 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.3 (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: ###
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
WXUNICODEFLAG =
!ifeq UNICODE 1
WXUNICODEFLAG = u
!endif
WXUNIVNAME =
!ifeq WXUNIV 1
WXUNIVNAME = univ
!endif
WXDLLFLAG =
!ifeq SHARED 1
WXDLLFLAG = dll
!endif
__fldll___depname =
!ifeq SHARED 1
__fldll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll
!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
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!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
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
!endif
__fllib___depname =
!ifeq SHARED 0
__fllib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
!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
__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
__EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 0
__EXCEPTIONSFLAG =
!endif
!ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG = -xs
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!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
__UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -d_UNICODE
!endif
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_dll$(CFG)
!endif
### Variables: ###
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
FLDLL_CXXFLAGS = -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 &
/fh=$(OBJS)\wxprec_fldll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
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 = $(__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 /fh=$(OBJS)\wxprec_fllib.pch &
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
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
all : $(OBJS)
$(OBJS) :
-if not exist $(OBJS) mkdir $(OBJS)
### Targets: ###
all : .SYMBOLIC $(__fldll___depname) $(__fllib___depname)
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)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)251$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.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 -p4096 -n -b $^@ @$(OBJS)\fllib.lbc
!endif
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(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_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_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(FLLIB_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_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) $<

View File

@@ -12,6 +12,7 @@
multicell.cpp
splittree.cpp
statpict.cpp
<!-- treelistctrl.cpp -->
</set>
<headers template="wx_contrib_headers">
@@ -22,17 +23,23 @@
wx/gizmos/multicell.h
wx/gizmos/splittree.h
wx/gizmos/statpict.h
wx/gizmos/gizmos.h
<!-- wx/gizmos/treelistctrl.h -->
</files>
</headers>
<dll id="gizmosdll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXMAKINGDLL</define>
<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,486 @@
# 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 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 "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 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gizmos - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "gizmos - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gizmos - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251_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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv251d_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251u_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 wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /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 "_UNICODE" /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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251ud_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 wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251ud_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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251d_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw251d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25d_gizmos.lib" /debug
!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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /W4 /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 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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /W4 /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 "_UNICODE" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.lib"
# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /W4 /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 /GR /GX /MD /O1 /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /W4 /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 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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /W4 /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 /GR /GX /MDd /Od /GR /GX /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /W4 /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"
!ENDIF
# Begin Target
# Name "gizmos - Win32 DLL Universal Unicode Release"
# Name "gizmos - Win32 DLL Universal Unicode Debug"
# Name "gizmos - Win32 DLL Universal Release"
# Name "gizmos - Win32 DLL Universal Debug"
# Name "gizmos - Win32 DLL Unicode Release"
# Name "gizmos - Win32 DLL Unicode Debug"
# Name "gizmos - Win32 DLL Release"
# Name "gizmos - Win32 DLL Debug"
# Name "gizmos - Win32 Universal Unicode Release"
# Name "gizmos - Win32 Universal Unicode Debug"
# Name "gizmos - Win32 Universal Release"
# Name "gizmos - Win32 Universal Debug"
# Name "gizmos - Win32 Unicode Release"
# Name "gizmos - Win32 Unicode Debug"
# Name "gizmos - Win32 Release"
# Name "gizmos - Win32 Debug"
# 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

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