Compare commits

...

357 Commits

Author SHA1 Message Date
Bryan Petty
64f581b650 This commit was manufactured by cvs2svn to create tag
'wxPy_last_28_merge'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_last_28_merge@45076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-26 19:55:31 +00:00
Robin Dunn
0d3847e80c reswigged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 07:07:46 +00:00
Robin Dunn
e86fbab1ba suspend logging while in wx.DataFormat.GetId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 07:07:07 +00:00
Robin Dunn
1ddcb14574 remove bad property
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 07:05:30 +00:00
Robin Dunn
a0d5472b1b Build and distrib tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 07:03:55 +00:00
Robin Dunn
6caa0f5cd1 No animate contrib anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:59:10 +00:00
Robin Dunn
5712281c5d Return an empty string from wxDataFormat::GetId if there was an error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:58:05 +00:00
Robin Dunn
68585e1770 Add some wxCHECK_MSG's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:53:42 +00:00
Robin Dunn
4aab34290a Return an empty string from GetValue if the textctrl is set to the
descriptive text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:47:33 +00:00
Robin Dunn
f24b783af3 Revert menus and toolbars to using wxNewId() too since their IDs can't
be negative either


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:43:59 +00:00
Paul Cornett
6d727f6c10 expose handlers are supposed to return a gboolean;
false may be correct, at least it's not random


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 01:58:53 +00:00
Vadim Zeitlin
5f28de16f3 fix infinite recursion when processing navigation keys in panels containing book controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 01:21:45 +00:00
Vadim Zeitlin
0fdd3cc881 reverted last commit, using result of NewControlId() when creating the control (instead of wxID_ANY) results in an assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 01:01:39 +00:00
Vadim Zeitlin
447325a44f use wxID_ANY for internal controller control instead of wxID_CHOICE/LIST/TOOLBAR/TREEBOOKTREEVIEW; this fixes asserts about using negative ids after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 00:52:05 +00:00
Vadim Zeitlin
3aba082d50 don't crash in dtor if the X11 window hadn't been created (patch 1640153)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 14:32:18 +00:00
Vadim Zeitlin
fc9f11cc6f name user config file appname.conf when it's locayed in ~/.appname by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 14:15:57 +00:00
Vadim Zeitlin
869c929083 set command int (indicating whether the item is checked) correctly for the menu events (bug 1639891)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 14:13:52 +00:00
Robin Dunn
9030e77918 wx.FRAME_FLOAT_ON_PARENT notes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 03:28:09 +00:00
Robin Dunn
67879c5b41 Use float-on-parent frames for the popups if wxPopupWindow is not available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 03:26:34 +00:00
Robin Dunn
a0232aa520 Added support for the wxFRAME_FLOAT_ON_PARENT style
Also add a mode for the wxPOPUP_WINDOW style as a temporary hack to
make it easier using a wxFrame as a replacement for wxPopupWindow.
See how it is used in wxStyledTextCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 03:23:43 +00:00
Václav Slavík
01ad5e43bf fixed typo in code for setting alternative locale name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 23:25:39 +00:00
Robin Dunn
1d51064ce3 Bump subrelease number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 20:17:39 +00:00
Robin Dunn
0149e27783 Add a note about wxSearchCtrl::[Get|Set]DescriptiveText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 20:15:22 +00:00
Robin Dunn
7fa8d0854b some updates to CHANGES.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 20:13:16 +00:00
Robin Dunn
fd363e1abc Added stepColour utility function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 19:51:08 +00:00
Julian Smart
df794ecc9f Corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 12:36:54 +00:00
Julian Smart
9aaca412e2 Added missing functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 12:17:27 +00:00
Robin Dunn
6646ca90e8 Added wxSearchCtrl::[Get|Set]DescriptiveText
Tweaked the layout of the subcontrols a bit
Lightened the icons to be more like Mac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 05:27:16 +00:00
Vadim Zeitlin
b901ac2c3b disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 00:19:57 +00:00
Vadim Zeitlin
04af2f5ce3 added wxCONFIG_USE_SUBDIR flag to wxFileConfig (patch 1620876)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 22:38:21 +00:00
Paul Cornett
49f29fbe2c revert last, GUI mutex isn't GUI-only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 21:56:51 +00:00
Robin Dunn
65d7319f85 styles, toolbar, and other visual tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 21:51:41 +00:00
Robin Dunn
1fe8ec6d3d Use kControlContentIconRef when recreating the tool for toggled state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 21:51:01 +00:00
Vadim Zeitlin
0f0298b10c added wxCSConv::IsOk() (patch 1637944)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 20:39:10 +00:00
Vadim Zeitlin
646c7e13ea corrected VC warning about possibly uninitialized variable in the last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 20:37:12 +00:00
Vadim Zeitlin
6594faa98e make wxTextFile work with unseekable files again (patch 1632613, bug 1629581)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 20:29:12 +00:00
Vadim Zeitlin
5a2d9e121f reverted last change: wxGTK-specific wxMutextGui code breaks linkage of wxBase programs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 19:53:36 +00:00
Robin Dunn
6a6c9417a8 Add GetDateOnly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 19:10:43 +00:00
Václav Slavík
627ddac99e compilation fix for !wxUSE_STATBOX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 18:27:58 +00:00
Paul Cornett
165d3652ff use GTK-specific GUI lock
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 18:13:34 +00:00
Vadim Zeitlin
186453cc7c added wx/window.h included needed by last change using wxWindow::NewControlId() (fixed PCH-less builds, bug 1638781)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 17:00:52 +00:00
Vadim Zeitlin
9249d38d6e use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with the user-defined ids
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:15:54 +00:00
Vadim Zeitlin
fb96cf856e added wxDateTime::GetDateOnly()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:06:37 +00:00
Vadim Zeitlin
75d0223f8c corrected crash: need to set m_frame eariler (Wlodek Szafran, closes bug 1636225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:03:16 +00:00
Robin Dunn
8030e0e954 minor tweaks for the widget inspector
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:39:00 +00:00
Robin Dunn
27587c251c The inspect module is now a widget browser plus a shell.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:37:12 +00:00
Robin Dunn
b08d67c27b reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:32:26 +00:00
Vadim Zeitlin
5541976c17 discard time part of m_date, otherwise comparisons with other dates fail
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:31:05 +00:00
Robin Dunn
7d69a5715e Make GridBagSizer.GetItem use FindItem if possible, to allow a
GBSizerItem to be returned instead of a SizerItem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:23:34 +00:00
Robin Dunn
61071e6160 some minor tweaks to make it possible to not show the default intro text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:05:14 +00:00
Robin Dunn
3e47020738 Use the system settings for the selection colours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 23:03:46 +00:00
Julian Smart
2207fd2168 Spacing corrections, removed duplicate functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 15:26:53 +00:00
Julian Smart
df0468c73a Corrected typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 14:51:11 +00:00
Julian Smart
652dbdc0ab Documented Set/GetBaseId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 09:07:32 +00:00
Václav Slavík
81073d9209 SETUPHDIR is Bakefile variable, not MSVC IDE one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 08:40:56 +00:00
Vadim Zeitlin
c25db58432 honour the drag effect supported by the drag source in wxIDropTarget (Tim Kosse)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 19:02:29 +00:00
Vadim Zeitlin
4d1f840337 added wx/image.h to fix non-PCH compilation after last commit (patch 1635649)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 10:54:40 +00:00
Paul Cornett
a1b289f1f9 don't change wxPRINTER_CANCELLED to wxPRINTER_ERROR, bug #1635284
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 02:23:13 +00:00
Paul Cornett
09a0945522 remove some unneeded includes, clean up gnome force link stuff a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 01:26:05 +00:00
Paul Cornett
3f83a9cda3 only gtk1 needs poll now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 00:24:54 +00:00
Paul Cornett
3b5d20079c chain to the polling function GLib was using before we replaced it, eliminating all the poll baggage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 00:21:57 +00:00
Vadim Zeitlin
b8508db8b4 create in place edit control with wxTE_PROCESS_ENTER style as otherwise it's not closed on Enter when used inside a panel or a dialog (which uses Enter for dialog navigation) (patch 1630586)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 21:04:27 +00:00
Vadim Zeitlin
0d3997fd6d corrected drawing of the bitmaps for the disabled menu items (replaces patch 1632891, closes bug 1632888)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 20:59:17 +00:00
Vadim Zeitlin
cfbf301d7c test rendering of disabled items with bitmaps (for bug 1632888)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 20:45:30 +00:00
Vadim Zeitlin
d95527de9a added wxSizerFlags::Shaped() and FixedMinSize() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 16:52:55 +00:00
Vadim Zeitlin
fc2b0e31bb added wxABI_VERSION check around new public wxFileHistory::Set/GetBaseId() methods and added them to version script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 16:38:53 +00:00
Vadim Zeitlin
4f690a1d5e don't crash when setting tooltip for a picker without text control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 16:18:36 +00:00
Julian Smart
5d389b0445 Provide access to file history base id
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 12:43:01 +00:00
Václav Slavík
6a6e282245 fixed child windows scrolling to use wxSIZE_ALLOW_MINUS_ONE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 21:46:51 +00:00
Robin Dunn
302129f896 PyCrust now has an option for showing/hiding the notebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 19:20:32 +00:00
Robin Dunn
19a885344a minor tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:42:56 +00:00
Robin Dunn
46831f391b Bug fix from Pierre
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:40:51 +00:00
Robin Dunn
cfce9d35ad Just reset the size, not the minsize too, when changing the label or
font.  This is how the native static text widgets behave.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:40:30 +00:00
Robin Dunn
f1c5e92f3f new test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:39:39 +00:00
Robin Dunn
da88bc1a18 removed bogus ImageList property
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:39:04 +00:00
Robin Dunn
d576c660f7 Added typeId property
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:38:15 +00:00
Robin Dunn
156d7d8626 Use the SearchCtrl for the filter. Make the accelerator table usable
again for testing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:28:40 +00:00
Robin Dunn
e49426a206 Fix for problem when Realize is re-called on a vertical toolbar, it
was making the tools layout horizontally.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:27:27 +00:00
Robin Dunn
7749035c4e DoGetBestSize fix, the lbWidth was not getting updated because of a
misplaced #endif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:25:21 +00:00
Robin Dunn
f241631e6d Fix for when only a default dir is given without a default file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:24:19 +00:00
Stefan Csomor
4b6930c813 making sure it is only breaking at newlines for measuring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 18:00:01 +00:00
Paul Cornett
8d206c073d add wxToolbook checking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 17:54:14 +00:00
Stefan Csomor
5a253c3f0a using the CF Message box only for non main thread alerts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 17:22:02 +00:00
Vadim Zeitlin
a8b2285edf only set cursor immediately in SetCursor() if the mouse is currently inside the window or we capture it (fixes the problem introduced in rev 1.675 while still correcting the original bug that change was done to fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-12 01:28:14 +00:00
Vadim Zeitlin
21de14b331 use wxNO_LEN and wxCONV_FAILED symbolic constants instead of -1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 16:41:43 +00:00
Julian Smart
e7b21b01fe Use the associated document manager, not the global one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 13:55:26 +00:00
Julian Smart
3d490242f0 Write a newline, not a 10 into the stream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 13:54:29 +00:00
Vadim Zeitlin
d40e9e06bb no changes, just refactor the code sending spin update event to SendSpinUpdate() instead of duplicating it; also initialize m_oldValue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 01:59:42 +00:00
Vadim Zeitlin
b6d8301814 apply patch 1630906 after all as with my simpler fix in the last commit the control may remain empty when it is supposed to show 0 value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 01:48:52 +00:00
Vadim Zeitlin
e816f5c736 fix lack of spin control update event when control lost focus (replaces patch 1630906, corrects bug introduced in rev 1.66)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 01:45:31 +00:00
Vadim Zeitlin
be809e82f2 suppress spurious error message when copying from clipboard brought empty string (patch 1630108)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 01:34:08 +00:00
Vadim Zeitlin
9c80e160ec reverted wrong change of rev 1.129 and fixed the first part of bug 1422217 in a better way by using InsertMenuItem() correctly for checkable items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 01:21:42 +00:00
Vadim Zeitlin
02f0eca5fb do strtoll() test using C++ compiler as at least under SGI this function is accessible from C99 but not C++ code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-11 00:30:13 +00:00
Václav Slavík
c640dfa5e8 added wxDFB to distribution scripts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 15:01:42 +00:00
Julian Smart
d716e45315 Removed versions so we don't have to update with every release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:53:57 +00:00
Julian Smart
9d5bd96c58 Updated date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:52:35 +00:00
Julian Smart
3273f8342e Updated version and date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:51:18 +00:00
Václav Slavík
1ff18f49b9 added support for Bakefile's upcoming msvs2005prj format (not enabled by default yet, would fail with the latest released version otherwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:03:23 +00:00
Vadim Zeitlin
8ef74b15f7 add #if wxUSE_TOOLTIPS around DoSetToolTip()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 13:45:11 +00:00
Chris Elliott
3b849b9a88 2.8.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 13:40:28 +00:00
Chris Elliott
b432b50d61 fix missing setup.h file(s) http://lists.wxwidgets.org/cgi-bin/ezmlm-cgi?8:mss:96442:cbnogdligcfeekgnnppi
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 13:38:17 +00:00
Julian Smart
715ce94da9 IsRich should be defined even if wxUSE_RICHTEXT isn't
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-09 21:26:53 +00:00
Julian Smart
3633deedb4 Fix for missing separator if any previous items were ownerdrawn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-09 21:19:09 +00:00
Vadim Zeitlin
a3c8c017cf check parameters after options check sothat usign -version doesn't result in an error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-09 14:35:06 +00:00
Vadim Zeitlin
fb66c150a4 show -version in the list of options; exit after showing the version as all the other programs do
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-09 14:29:38 +00:00
Vadim Zeitlin
63dd461bc8 more about virtual functions access specifier changing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-09 14:01:08 +00:00
Robin Dunn
a8990bd443 don't use default style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 23:54:11 +00:00
Robin Dunn
3173a64c51 Tweak dates and version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 23:45:11 +00:00
Robin Dunn
5fd01bf150 Version --> 2.8.1.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 23:31:44 +00:00
Robin Dunn
1ceb4f4d19 Minor tweaks to get up to date with wx CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 23:10:39 +00:00
Robin Dunn
070a1e7e3b ignore things that are just defined for the sake of the preprocessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 22:58:22 +00:00
Vadim Zeitlin
0b8055d224 added more wxUSE_TREE/LISTCTRL tests to fix compilation when they're set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 15:04:19 +00:00
Chris Elliott
c267649e53 2.8.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 15:04:07 +00:00
Chris Elliott
8e3fa7eecc remove space which broke tex2rtf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 14:47:02 +00:00
Chris Elliott
c1cef60b50 fix part of proposal at http://news.gmane.org/find-root.php?message_id=%3c45A2343E.40203%40gmx.de%3e
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 13:40:59 +00:00
Vadim Zeitlin
6f8415ca56 use wxLongLong_t instead of long long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 11:17:15 +00:00
Paul Cornett
46beb2e98d non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 07:11:51 +00:00
Kevin Ollivier
255dcbd7cb Fix GetNextItem for virtual wxListCtrl, and improve behavior for wxLIST_NEXT_ALL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 02:52:09 +00:00
Vadim Zeitlin
090afcf011 fix compilation for latest SDK where EnumModulesProc() first parameter is now const (bug 1629333)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 23:35:49 +00:00
Vadim Zeitlin
d200d68cbf updated version to 2.8.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:48:56 +00:00
Vadim Zeitlin
311360b893 also update wxVERSION_STRING
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:48:06 +00:00
Vadim Zeitlin
f559e6218d fix wxConfig::DeleteGroup() for arguments with trailing slash (replaces patch 1624589)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:41:39 +00:00
Vadim Zeitlin
e7f84ba5b1 apparently the previous version was generated with a wrong bakefile, regenererated with 0.2.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:30:12 +00:00
Vadim Zeitlin
af0ee083f8 also update manual.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:28:07 +00:00
Vadim Zeitlin
7bf325389e more informative output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:26:44 +00:00
Vadim Zeitlin
4fd169bda5 updated version to 2.8.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 22:21:20 +00:00
Stefan Neis
2887cb4e38 Attempt at fixing deepCopyHostent/Servent.
Fixed MT problem my making mutexes global.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 21:38:08 +00:00
Vadim Zeitlin
7de9aaf012 added a script to update release version field
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 21:34:48 +00:00
Vadim Zeitlin
21ead7676a don't compile wxDataViewDateRendererPopupTransient if !wxUSE_POPUPWIN (as is always the case under Mac) (bug 1616964)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 20:13:16 +00:00
Vadim Zeitlin
8854a202f4 no changes, just removed duplicate TreeView_HitTest() calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 20:09:15 +00:00
Vadim Zeitlin
a1d5a2937a corrected message about page number overflow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 19:58:48 +00:00
Vadim Zeitlin
9fcf8144d9 added EVT_TASKBAR_CLICK and use it to show taskbar icon menu on right button release, not press, under MSW (bug 1623761)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 19:44:14 +00:00
Vadim Zeitlin
52b222fe31 regenerated after wx/richtext/richtextstyles.h addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 19:41:52 +00:00
Vadim Zeitlin
ff202bcb56 added wx/richtext/richtextstyles.h (bug 1624364)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 19:29:54 +00:00
Vadim Zeitlin
bcbec8656f make HitTest() public (bug 1626543); this changes ABI for protected part of wx API but not for the public one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 19:27:33 +00:00
Stefan Neis
43c974071f Fixed switching to a different drive/volume on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 18:22:57 +00:00
Kevin Ollivier
ad31e6a2da Add more sanity checks to virtual list item nums as the native control sometimes fires events before things are totally set up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 17:53:42 +00:00
Kevin Ollivier
2458daa728 Make it easier to switch between native and generic sample for testing purposes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 17:28:18 +00:00
Vadim Zeitlin
0917b10c4b disable wxCollapsiblePane compilation in wx/chkconf.h, not wx/generic/collpaneg.h (bug 1620397)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 17:26:19 +00:00
Vadim Zeitlin
2c03d7714c fix attribute memory leak in wxGrid::ShowCellEditControl() (patch 1629949)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 17:09:54 +00:00
Vadim Zeitlin
b726328b48 added support and enable long long support when wxLongLong_t is available even if SIZEOF_LONG_LONG is not under wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:58:17 +00:00
Vadim Zeitlin
3e85709e97 fix wxMDIChidFrame::GetPosition() (patch 1626610)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:42:00 +00:00
Vadim Zeitlin
35c4b4da0a fix wxConfig::DeleteGroup() for arguments with trailing slash (replaces patch 1624589)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:36:54 +00:00
Vadim Zeitlin
bde1da6d3f include WebKit.h as otherwise WebKit is not detected on PPC with gcc 3.3 (patch 1623616)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:25:04 +00:00
Vadim Zeitlin
82950569f9 mention RTL fixes by Diaa Sami
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:19:46 +00:00
Vadim Zeitlin
c4b37573a9 fix combobox dropdown position in RTL (patch 1623127)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:18:55 +00:00
Vadim Zeitlin
f2bbe5b675 fixes and workarounds to return value of our own wxVsnprintf_() implementation: handle -1 as error and not an indication that there is not enough space (patch 1623077)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:17:28 +00:00
Vadim Zeitlin
d2aa263fd1 fix for popup positioning in RTL mode (patch 1622930)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:07:59 +00:00
Vadim Zeitlin
a2dc658bba set tooltips for the both subcontrols (patch 1622531)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:00:11 +00:00
Vadim Zeitlin
bf41d9034a added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() to version-script and use wxABI checks for them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 15:53:03 +00:00
Vadim Zeitlin
8f6dc819f8 return correct item and position from wxTreeEvent::GetItem/Point() (patch 1622166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 15:43:22 +00:00
Vadim Zeitlin
0d93bb5039 corrected ctor signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 15:41:55 +00:00
Vadim Zeitlin
9248adc8da added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() methods; documented wxTreeItemId (patch 1622125)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 15:02:57 +00:00
Vadim Zeitlin
633f0196de operators == and != are const (part of patch 1622125)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 14:55:15 +00:00
Stefan Neis
4f6eaf5ee2 Extended wxGetHostName implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 14:07:02 +00:00
Stefan Neis
783388d5d9 Added wxGetDiskSpace implementation (patch #1625514).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 13:52:22 +00:00
Stefan Neis
e196c0a258 Compilation fix for really old gcc versions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 13:28:16 +00:00
Vadim Zeitlin
c05daf1bfd changed copyright year to 2007
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 02:05:28 +00:00
Kevin Ollivier
a44a646b7e Use GetItem to get item info for events, even for virtual wxListCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 01:21:19 +00:00
Kevin Ollivier
ed9a7a63b8 Generic list and tree ctrl should not use the focused selection color when the top level window is not active.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 01:15:20 +00:00
Robin Dunn
3d7a1b394b Add dependency on tabmdi.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 19:44:28 +00:00
Robin Dunn
34d71f81f4 Added wx.aui.AuiNotebook.GetAuiManager().
Added wx.aui.AuiMDIParentFrame and wx.aui.AuiMDIChildFrame, which
essentially implement the MDI interface using a normal wx.Frame and a
wx.aui.AuiNotebook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 09:01:34 +00:00
Robin Dunn
b0a54b8a6b Fixes for segfaults when the parent frame is destroyed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 08:59:01 +00:00
Robin Dunn
0eaf8cd16c Add GetAuiManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 08:53:33 +00:00
Kevin Ollivier
b64274c77a Add a grid sizer demo, and document the props accepted by SetSizerProps.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 02:09:00 +00:00
Kevin Ollivier
f80419c886 Don't draw the primary highlight colors if the control doesn't have the focus.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-06 01:53:52 +00:00
Kevin Ollivier
e5d3d8ad45 Apply patch #1626802, which fixes GetNextItem to return -1 instead of 0 when an item can't be found, and add support for wxLIST_NEXT_ABOVE, wxLIST_NEXT_BELOW, and wxLIST_STATE_DONTCARE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 19:45:38 +00:00
Włodzimierz Skiba
ccf6c43b3d '-version' parameter for tex2rtf.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 17:30:42 +00:00
Stefan Csomor
6cfe484434 allowing vertical scrolling even if wxTE_NO_VSCROLL is given, displaying a scrollbar only when needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 16:28:03 +00:00
Vadim Zeitlin
0bddba445f more unescaped underscores
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 14:49:41 +00:00
Vadim Zeitlin
23fb9116c3 fix broken links to File/DirName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 14:30:39 +00:00
Vadim Zeitlin
3e69f6e58e rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-05 13:36:49 +00:00
Jouk Jansen
82ddc0cae3 Update OpenVMS make-files
Modified Files:
 	wxWidgets/src/common/descrip.mms wxWidgets/src/x11/descrip.mms


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-04 08:09:51 +00:00
Kevin Ollivier
8a14de8aa9 Have SetSizerProps internally handle the assignment of growable rows and cols.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-04 06:47:19 +00:00
Václav Slavík
f7a5043240 fixed deadlock when calling wxPostEvent() from worker thread
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-03 17:25:47 +00:00
Robin Dunn
c81f58f7e5 Remove some items from the Recent additions list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-02 23:19:29 +00:00
Robin Dunn
eee9bf2e5c reformat the overview string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-02 23:18:23 +00:00
Chris Elliott
ef1160a7dc fix errant __BORLAND__ see http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/70616/match=common+intl+cpp+problems+bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-02 20:50:07 +00:00
Jouk Jansen
7538fdc9a6 avoid reading KDE-tables on OpenVMS. They will never be installed since KDE
is not available on OpenVMS.

 Modified Files:
 	wxWidgets/src/unix/mimetype.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-02 09:55:34 +00:00
Paul Cornett
ca2261d33f restore declaration inline specifier, and make definition match
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-01 22:27:42 +00:00
Robin Dunn
4e8107d57a reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-01 20:56:51 +00:00
Robin Dunn
395e0a70ba Don't steal VK_RETURN for wxEVT_COMMAND_LIST_ITEM_ACTIVATED if any of
the modifier keys is pressed.  This let's RETURN+Modifier be used as
a normal accelerator key when the list ctrl has the focus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-01 20:48:51 +00:00
Robin Dunn
aeffa0721d fixed a compile error in one of the stub classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-01 20:47:05 +00:00
Paul Cornett
ffdbfc4a76 remove inline from declaration of functions which are not inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-01 19:49:10 +00:00
Vadim Zeitlin
9f5e5c31a8 correct OnOpenError() return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-31 18:07:45 +00:00
Kevin Ollivier
3bdec81e14 Adding overview docs and a couple tweaks to the demo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-31 06:50:13 +00:00
Kevin Ollivier
5448935a30 Add SizedControls demo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-31 06:06:05 +00:00
Kevin Ollivier
1a4b6b97b1 Make sure mouse events are only sent in the case of the native control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-31 06:03:51 +00:00
Stefan Neis
7528971e6b Fixed mismatch between wxOperatingSystemIdNames and wxOperatingSystemId (patch #1625019).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-30 21:46:22 +00:00
Chris Elliott
8e287ae93f revert this as Vadim's seems cleaner http://cvs.wxwidgets.org/viewcvs.cgi/wxWidgets/distrib/scripts/create_archives.sh.diff?r1=1.19&r2=1.20
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-30 20:21:11 +00:00
Vadim Zeitlin
631787c478 wxVariant and wxVariantData are ref counted too (patch 1624344)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 20:22:23 +00:00
Vadim Zeitlin
b2b4f8c0ca wxFileModificationTime return -1, not 0, on error (patch 1624484)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 20:18:57 +00:00
Vadim Zeitlin
02d5015b1c fixed incorrectly inversed test for parent [not] being deleted (patch 1624472)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 20:16:53 +00:00
Julian Smart
61f84e2493 Process capture lost event to avoid assertion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 19:37:04 +00:00
Paul Cornett
046c2f1404 fix idle handling when a new event loop is run from an idle event handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 20:03:05 +00:00
Kevin Ollivier
defeae282f Fixing inactive state drawing, and removing warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 17:50:53 +00:00
Václav Slavík
44038f9a6c added comment with pointers to wxEVT_MOUSE_CAPTURE_LOST discussion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 16:33:22 +00:00
Stefan Csomor
e9a4bf7ddc fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise) bug 1621547
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 16:08:38 +00:00
Julian Smart
99a7bebb65 Temporary fix for inconsistent menu item margins (see Quit item in ownerdraw sample)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 13:52:58 +00:00
Kevin Ollivier
de387fc99c exposing generic system option define, adding missing event.Skip() to OnChar, and tweaking handling of scrollbars.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-28 06:33:57 +00:00
Stefan Csomor
b9d495a007 applying patch 1622389, fixing two memory leaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-27 15:49:26 +00:00
Kevin Ollivier
7e2ee0bf41 Add middle-item click support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-26 20:44:24 +00:00
Robin Dunn
7f3e07a83a Fix for bug #1621459, Made the Selection property read-only since it
needs two parameters.  You can instead use SelectionStart and
SelectionEnd properties for setting the selection if needed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-26 20:32:51 +00:00
Kevin Ollivier
e0329d2476 Stop crash when wxVSCROLL is specified for native OS X wxListCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-25 19:28:11 +00:00
Vadim Zeitlin
12e424d28f show RTL message box (in Unicode build only) when using RTL (patch 1622000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-25 14:39:11 +00:00
Kevin Ollivier
d2a931c9f7 Add new wxListCtrl symbols.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-25 00:34:23 +00:00
Kevin Ollivier
b3ff5a475b Implement LIST_KEY_DOWN support, and move new functions into wxABI_VERSION.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-25 00:21:05 +00:00
Václav Slavík
f321ab7fb4 disable (some) features that are not available in DirectFB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 19:50:28 +00:00
Václav Slavík
9c6d8b7cdb fixed wxFrame background colour in wxUniv on ports without native wxSYS_COLOUR_APPWORKSPACE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 19:06:39 +00:00
Kevin Ollivier
ccea21ccf8 Implementing LIST_ITEM_RIGHT_CLICK event support, and fixing sorting (turning off code for native sorting).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 18:39:40 +00:00
Vadim Zeitlin
8605f9c571 compare charset strings case-insensitively (and so avoid conversions between utf-8 and UTF-8 for example, see patch 1611068)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 13:36:22 +00:00
Vadim Zeitlin
338b2a02ce document ShowHidden() (patch 1619786)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 12:38:38 +00:00
Vadim Zeitlin
629ddfb03e added a couple of missing membersections and fixed a couple of typos (patch 1618846)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 12:19:27 +00:00
Vadim Zeitlin
f928b1ab18 fix hint rect position for RTL (patch 1618719 from Tim Kosse)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 12:16:28 +00:00
Vadim Zeitlin
0ae9003c21 fill in sqlDataType field of wxDbColInf in ExecSql() (patch 1614539)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 12:14:31 +00:00
Vadim Zeitlin
3fafce674b compilation fixes for --disable-compat26 (patch 1619037)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 12:08:37 +00:00
Václav Slavík
574d48dbe4 removed #ifdefs that conditionally included the exact same code on Mac and non-Mac, instead of having just one copy of it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 01:33:09 +00:00
Vadim Zeitlin
190b93449e another fix for the default button in the dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 01:21:53 +00:00
Vadim Zeitlin
16837dc334 document --selected-config option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 01:20:33 +00:00
Vadim Zeitlin
95fab76ba0 1. Don't draw our own custom label if we don't have custom foreground colour,
we don't need to do it then as it works just fine by default then

2. Use the theme font for the label (doesn't do anything for the default Luna
   theme but helps a lot with custom themes, unfortunately metrics are still
   wrong with them)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 22:20:53 +00:00
Vadim Zeitlin
6969c2c318 added AutoHFONT; allow initialize SelectInHDC later (and not necessarily in ctor)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 22:11:16 +00:00
Julian Smart
e3eac0ff7f Bullet size should take into account the font of the immediately following content.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 15:57:45 +00:00
Julian Smart
7947a11dad Optimization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 15:54:59 +00:00
Mart Raudsepp
bdb5188415 Change style flag on floating frames to give proper minimize behaviour. Thanks to Chris Mellon; needed for my app
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 13:03:00 +00:00
Robin Dunn
dc99f469f5 minitest for wx.BusyInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:12:59 +00:00
Robin Dunn
59ccbf7fec reSWIGGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:11:49 +00:00
Robin Dunn
2bd162773d Reset the item's text in SetItemFont to ensure that the text will be
remeasured with the new font, and the bounding rect will be adjusted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:10:15 +00:00
Robin Dunn
e1944ad852 Don't try to access a color not in the dictionary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:02:59 +00:00
Robin Dunn
cefcc57db8 RemoveItem should return the same object it is passed, but adjusted
for new ownership


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:02:23 +00:00
Robin Dunn
55424c8c22 wxColor --> wxColour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 23:57:34 +00:00
Robin Dunn
015131a1fd Add parent parameter to BusyInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 23:55:58 +00:00
Robin Dunn
38c213b192 Unicode is the default build mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 23:54:34 +00:00
Robin Dunn
e1463b9df0 Patches from Andrea
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 23:52:32 +00:00
Robin Dunn
c306c1e0f6 put wx in the shell's namespace too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 23:50:51 +00:00
Kevin Ollivier
471046b088 Adding SetFocus to wxABI_VERSION.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 20:14:38 +00:00
Kevin Ollivier
cf6982fae6 Fix for non-PCH builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 20:05:08 +00:00
Chris Elliott
5c7d3eb176 fix for build with x11 reported here http://lists.wxwidgets.org/cgi-bin/ezmlm-cgi?8:mss:96187:200612:dimemphnemjnfeciaghe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-22 11:20:58 +00:00
Vadim Zeitlin
d69f7c5831 reversed binary and forward compatibility terms to their usual meanings; added a section about binary compatibility preserving changes explicitly mentioning that overriding of existing virtual functions seems to be safe; fixed typos/spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 22:28:15 +00:00
Vadim Zeitlin
cbf6ba7559 added wx{Dir|File}Dialog::Get/SetStyle() for 2.8.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 22:04:48 +00:00
Vadim Zeitlin
cc197ed421 restored (as deprecated) accidentally removed wx{Dir|File}Dialog::Get/SetStyle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 19:26:48 +00:00
Václav Slavík
9a9b58229f compilation fix for !wxUSE_VALIDATORS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 18:24:27 +00:00
Václav Slavík
f1f5f16f78 sockets work with wxDFB now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 17:52:16 +00:00
Kevin Ollivier
bc63f2c969 Restore compilation with --enable-stl, fix SetFocus with the generic control, and re-instate the use of ids to sort when a specific sort function isn't being used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-21 06:53:53 +00:00
Vadim Zeitlin
ff1bd293e1 C/POSIX locales (or absence of locale information) corresponds to wxLANGUAGE_ENGLISH_US, not wxLANGUAGE_ENGLISH which is the same as wxLANGUAGE_ENGLISH_UK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 23:24:36 +00:00
Vadim Zeitlin
8ebf24655c unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 13:45:08 +00:00
Vadim Zeitlin
9b99c1e36a changing ES_LEFT/CENTER/RIGHT styles only works for plain (not rich) controls and only under XP, recreate the control in SetWindowStyleFlag() if it's a richedit one or if the system is earlier than XP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 13:38:25 +00:00
Vadim Zeitlin
b370e7587f fixed initial size of a control with wxDefaultSize: due to SetSize() call in Create() introduced in 1.243 it was created with 1 pixel height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 10:06:43 +00:00
Vadim Zeitlin
9fcbe07663 we don't need to subclass text control twice to implement support for WM_COPY/CUT/PASTE, just handle them in MSWWindowProc() (this reimplements the change of rev 1.261 correctly)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 09:51:50 +00:00
Chris Elliott
5b204a088a copy univ setup.h for VC IDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 09:45:42 +00:00
Stefan Csomor
4d7e2cdad3 best size fix for multi-line fields
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 08:45:48 +00:00
Vadim Zeitlin
c0c677934f make the continue button default, not the stop one, to avoid killing the application accidentally if it doesn't run under debugger and Enter is pressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 23:36:53 +00:00
Stefan Csomor
f02f4d43c5 fvisibility-inlines-hidden fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 13:49:26 +00:00
Mart Raudsepp
afc2d3bc8a Unswap example returns values for GetPluginsDir and GetResourcesDir. They got swapped by the introduction of
GetResourcesDir documentation in rev1.12, see
http://cvs.wxwidgets.org/viewcvs.cgi/wxWidgets/docs/latex/wx/stdpaths.tex.diff?r1=1.11&r2=1.12
Noticed by Giuseppe Bilotta


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 12:41:41 +00:00
Jouk Jansen
dbba880ee5 Committing in .
Update configuration file for OpenVMS

 Modified Files:
 	wxWidgets/setup.h_vms


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 11:25:09 +00:00
Vadim Zeitlin
72d11e1734 don't include non existent tools/gettext directory in the distribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 10:52:34 +00:00
Vadim Zeitlin
9a137faacf removed (non existing any more) mobile/* files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 10:45:52 +00:00
Vadim Zeitlin
e019c6429d include wxUniv files into wxX11 distribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 08:29:37 +00:00
Stefan Csomor
f84a986cfc fixing -fvisibility-inlines-hidden problem (IsOk function didn't get exported)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-19 05:43:19 +00:00
Robin Dunn
f0db59f269 remove debug code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:52:48 +00:00
Robin Dunn
4b32f8c79e minor demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:19:04 +00:00
Robin Dunn
facc1d350b wx.lib.customtreectrl patches from Andrea Gavana.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:18:07 +00:00
Robin Dunn
89d1e2eeab reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:15:37 +00:00
Robin Dunn
09d48154cc Make wx.MenuItem.Destroy a NOP since the regular garbage collection
will handle the destruction now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:14:03 +00:00
Robin Dunn
bcf4fef288 Some docstring changes, default value for clockwise arg in AddArc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 23:13:12 +00:00
Robin Dunn
d7db6a4351 bump subrelease number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 20:22:32 +00:00
Václav Slavík
757b694ba8 wxDFB: fix events processing to support sockets events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-18 17:24:06 +00:00
Vadim Zeitlin
18c7af7e80 suppress a CodeWarrior warning about long to int conversion (bug 1616948)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 15:49:46 +00:00
Vadim Zeitlin
9e1c7236e0 don't treat foo in c:\\foo\bar as network share
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 14:52:10 +00:00
Vadim Zeitlin
9b9596de5e corrected tests to deal with multiple consecutive (back)slashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 14:49:50 +00:00
Vadim Zeitlin
34841b216c added test for parsing c:\\aaa\bbb\ccc paths (aaa shouldn't be interpreted as network share)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 14:13:23 +00:00
Vadim Zeitlin
8c0f22340e don't set the label colour in DrawButtonLabel(), this is done by the caller in wxControlRenderer::DrawLabel()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 13:47:48 +00:00
Vadim Zeitlin
388703a573 forcefully get rid of the scrollbars in CalcWindowSizes() if we don't need them any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-17 02:13:04 +00:00
Vadim Zeitlin
698581160d for for initializing wxFileName with empty string returning true from IsOk() and tests for the correct behaviour (patch 1617156)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-16 23:11:48 +00:00
Vadim Zeitlin
779e158bb2 added links to Dir/FileName in construction section (part of patch 1617156)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-16 23:08:07 +00:00
Vadim Zeitlin
a2f2764dfb don't set score files permissions to 0666, why would this be needed or wanted? (and it didn't compile in Unicode build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-16 15:18:41 +00:00
Vadim Zeitlin
cd977e12f9 added include/msvc/wx/setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-16 15:11:38 +00:00
Vadim Zeitlin
0646b21922 test both wxMBConvUTFxx and wxCSConv(wxFONTENCODING_UTFxx), they should behave the same
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-16 15:09:32 +00:00
Robin Dunn
0d8a01fdaa Fix for the Demos menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 23:15:59 +00:00
Robin Dunn
8e509c4b0c wx.aui.AUI_ART_GRADIENT_TYPE --> wx.aui.AUI_DOCKART_GRADIENT_TYPE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 23:15:09 +00:00
Stefan Csomor
be13a26775 adding common search field file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 10:03:50 +00:00
Stefan Csomor
84d3bc74b1 using native architecture for development builds only, saves half of the compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 06:14:31 +00:00
Vadim Zeitlin
cd840087aa fix compilation with wxUSE_STL=1 for VC6 (and presumably others) (bug 1614814)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 01:47:26 +00:00
Vadim Zeitlin
9c5fd8a319 respect background colour of wxStaticText in wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 01:32:26 +00:00
Vadim Zeitlin
5fe6c02bb8 correct GetBestSize() to return correct best size, i.e. the same size as AutoSize() would give to the control since the fix in 1.407
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 01:30:52 +00:00
Vadim Zeitlin
9b8a360d4d mention wxRmDir() and its opposite return value meaning in wxRmdir() description (bug 1614494)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 01:20:02 +00:00
Vadim Zeitlin
dc4689ef73 correct GetBestSize() to return correct best size, i.e. the same size as AutoSize() would give to the control since the fix in 1.407
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-15 01:09:06 +00:00
Václav Slavík
d8bfd72731 wxDFB's wxICON and wxBITMAP should use embedded XPMs, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 17:45:06 +00:00
Václav Slavík
2c4eefc056 compilation fix for wxUSE_ACCEL && !wxUSE_BUTTON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 16:53:05 +00:00
Václav Slavík
6b44a33553 moved wxX11's wxSocketTable to private wxSocketEventDispatcher class reusable in other ports (backport from SOC2006_SOCKETS branch); use it in wxDFB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 14:13:57 +00:00
Václav Slavík
ede5511517 fixed wxStdRenderer::DrawButtonLabel() to not change text colour, otherwise menu items below a disabled item would be rendered incorrectly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 13:54:06 +00:00
Paul Cornett
8c70a78958 make sure style is set on menubar before querying its size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 07:19:21 +00:00
Vadim Zeitlin
dc7c33c455 really removed __WIN95__ (as mentioned, but not done, in last commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 02:08:13 +00:00
Vadim Zeitlin
9f8ffc5f8b test for __WIN32__ and not __WIN95__ when defining wxUSE_OWNER_DRAWN and wxUSE_RICHEDIT; don't even define __WIN95__ any more as it's not used anywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 02:07:03 +00:00
Michael Wetherell
9fea3325be Fix for printf positional parameter check from Francesco.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-14 00:07:15 +00:00
Vadim Zeitlin
0ec8d8f72c mention bcc Unicode build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 19:04:19 +00:00
Vadim Zeitlin
265db88d61 don't crash in Unicode build if command line arguments are not valid UTF-8 strings (bug 1614363)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 19:03:34 +00:00
Chris Elliott
e6444871c1 add distrib\mac\pbsetup-sh to mac distro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 18:55:36 +00:00
Vadim Zeitlin
4326154d28 added 2.8.0.1-1 packaged by myself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 18:24:43 +00:00
Vadim Zeitlin
31a8ceaf5f added a tiny script to build both ANSI and Unicode debian packages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 13:14:40 +00:00
Vadim Zeitlin
172d83f4ea cast size_t to unsigned long, not unsigned (even though there is no risk of truncation here, it's still better practice)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 13:04:44 +00:00
Michael Wetherell
62f04b576f Change wxMkDir/wxRmDir to _wmkdir/_wrmdir for Borland unicode builds to match
recent change of wxMBFILES.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 12:32:08 +00:00
Václav Slavík
0881232f66 make sure the window is fully painted before DirectFB WM shows it, otherwise artifacts could be seen on the screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 12:08:30 +00:00
Chris Elliott
948ddccfab avoid configure, etc being in DOS format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 09:46:20 +00:00
Chris Elliott
3fa27f794b move on to 2.8.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 09:25:35 +00:00
Chris Elliott
0ecdaebb94 tidy up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 09:24:20 +00:00
Chris Elliott
fd7741f907 try toi fix readme readme
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 09:18:35 +00:00
Chris Elliott
840c7ccebf up to 2.8.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-13 08:49:18 +00:00
Robert Roebling
10eeb875ec Made wxSearchCtrl look like other text controls under GTK+.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 22:27:01 +00:00
Robert Roebling
b529726eff Add a few more controls to the toolbar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 21:44:51 +00:00
Robert Roebling
86b6546709 Moved allocate size correction code from combobox
to toolbar code since that is where the problem
    is and it affects other controls, too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 21:43:55 +00:00
Robin Dunn
0cdd04ad99 Add entry for 2.8.0.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 16:08:26 +00:00
Vadim Zeitlin
e28b9b9cb8 replaced 25 in libraries names with 28
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 11:50:04 +00:00
Robert Roebling
a73ae836df Add hack for correct height of wxComboBox in
toolbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 10:40:46 +00:00
Robin Dunn
a7a0597ee7 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 07:25:29 +00:00
Robin Dunn
68fc5c8025 Compile fixes for Panther
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 07:23:17 +00:00
Robin Dunn
e6239913ac Typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 02:09:34 +00:00
Robin Dunn
8d3223cb32 Bump subrelease number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 01:52:43 +00:00
Robin Dunn
169f3a3d6f Added a set of button classes to wx.lib.buttons from David Hughes that
uses the native renderer to draw the button.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 01:51:18 +00:00
Robin Dunn
d1fa6ef3dd Mention wx.SearchCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 01:00:20 +00:00
Robin Dunn
af1f44f17e Also do LayoutControls from EVT_SIZE handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 00:53:52 +00:00
Robin Dunn
4ed51f4d1c Some more _BTN changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:32:09 +00:00
Robin Dunn
eebbbda154 Put a separator between the controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:27:41 +00:00
Robin Dunn
c33c11fa1d comment out test code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:26:58 +00:00
Václav Slavík
2c74c55876 fixed wxCSConv to work again for iso-8859-1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:14:48 +00:00
Robin Dunn
9b4c231467 Fix compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:12:32 +00:00
Kevin Ollivier
c60122bf37 Change event names to clarify that they are only fired by button clicks, and note ways of retrieving search queries in the docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 20:32:16 +00:00
Robin Dunn
6235857802 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 20:13:21 +00:00
Robin Dunn
8fb6915941 Add docstrings and a dummy class to be used in builds that don't have wxSearchCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 20:10:37 +00:00
Robin Dunn
a8728f8f37 Remove AdjustedBestSize property since the function it calls is deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 20:07:18 +00:00
Paul Cornett
1c62bcbeeb cleanup:
wrap everything in #if wxUSE_SEARCHCTRL,
    implementation include comes first


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 18:34:59 +00:00
Paul Cornett
09d93215cf cleanup:
wrap everything in #if wxUSE_SEARCHCTRL,
    implementation include comes first,
    parenthesize macro replacement containing operators,
    unused variable,
    use of pointer after delete,
    bizarre boolean expression


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 18:33:58 +00:00
Robin Dunn
70b63a9909 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 18:28:11 +00:00
Robin Dunn
5ec5b47f47 Docstring fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 18:26:49 +00:00
Kevin Ollivier
0a95d3369e Updating with Vadim's API changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 16:34:36 +00:00
Vadim Zeitlin
95004448ad removed unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:18:58 +00:00
Vadim Zeitlin
ef0abde66c more SetXXXVisible/ShowXXX() replacements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:17:44 +00:00
Vadim Zeitlin
8bc333d76d added $Id$ to the header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:14:07 +00:00
Vadim Zeitlin
5b43c75c1d added wx prefix to wxUSE_NATIVE_SEARCH_CONTROL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:08:17 +00:00
Vadim Zeitlin
7420cf5bf3 mention wxSearchCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:48:56 +00:00
Vadim Zeitlin
ec184e3242 1. Renamed Set/GetXXXVisible() to ShowXXX() and IsXXXVisible()
2. Moved wxSearchCtrlBase to wx/srchctrl.h to avoid duplicating it
3. Removed gcc #pragmas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:48:18 +00:00
Vadim Zeitlin
8138b9a4e2 wxSearchCtrl is an editable control (too)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:34:27 +00:00
Vadim Zeitlin
0443b90dc4 deTABified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:31:53 +00:00
Vadim Zeitlin
1525e5435c restored variabes initialization in OnButtonSet() to avoid spurious MSVC warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:30:27 +00:00
Vadim Zeitlin
152e99d73f fix LaTeX syntax (non-escaped underscore)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:11:29 +00:00
Vadim Zeitlin
0bf0b6bb87 compilation fix for USE_PCH==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 12:58:20 +00:00
Vadim Zeitlin
7a71ffc175 use wx prefix for wxUSE_NATIVE_SEARCH_CONTROL macro name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 12:57:35 +00:00
Chris Elliott
675c8837a5 2.8.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 10:25:23 +00:00
Chris Elliott
6f011faaf0 fix watcom problem (thanks ABX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 09:43:39 +00:00
Chris Elliott
2901bc729b sorry about bad commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 09:33:34 +00:00
Chris Elliott
38f74dffc1 fix missing includessrc/generic/srchctlg.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 09:30:26 +00:00
Włodzimierz Skiba
7cd8f61a4b Updated build files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 08:04:49 +00:00
Robin Dunn
2efce8f1ad include bitmap.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 07:48:02 +00:00
Kevin Ollivier
698db322d0 Improve default wxSearchCtrl GetBestSize() width and ensure that SetFocus focuses in the control's text area.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 07:35:46 +00:00
Robin Dunn
bda4b4c684 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 07:33:10 +00:00
Robin Dunn
ece5ecd8fb Move #include of srchctrl.h to wxPython_int.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 07:19:22 +00:00
Robin Dunn
3f7f284d55 Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchField)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 06:19:27 +00:00
Robin Dunn
16ba9ea815 size_t's --> int's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 04:20:43 +00:00
8680 changed files with 28551 additions and 3146650 deletions

View File

@@ -1,12 +0,0 @@
.gdb_history
config.cache
configarg.cache
config.status
wx-config
config.log
stamp-h.in
Makefile
setup.h
*tags
.DS_Store
autom4te.cache

View File

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

29913
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,835 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl
dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl Vadim Zeitlin and Ron Lee
dnl
dnl This script is under the wxWindows licence.
dnl
dnl Version: $Id$
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl Objective-C(++) related macros
dnl ===========================================================================
m4_define([AC_WX_LANG_OBJECTIVEC],
[AC_LANG(C)
ac_ext=m
])
m4_define([AC_WX_LANG_OBJECTIVECPLUSPLUS],
[AC_LANG(C++)
ac_ext=mm
])
dnl ===========================================================================
dnl macros to find the a file in the list of include/lib paths
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
break
fi
done
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
done
done
])
dnl ---------------------------------------------------------------------------
dnl return list of standard library paths
dnl ---------------------------------------------------------------------------
dnl return all default locations:
dnl - /usr/lib: standard
dnl - /usr/lib32: n32 ABI on IRIX
dnl - /usr/lib64: n64 ABI on IRIX
dnl - /usr/lib/64: 64 bit ABI on Solaris and Linux x86-64
dnl
dnl NB: if any of directories in the list is not a subdir of /usr, code setting
dnl wx_cv_std_libpath needs to be updated
AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
dnl ---------------------------------------------------------------------------
dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
fi
fi
])
dnl ---------------------------------------------------------------------------
dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
dnl
dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
dnl after calling this function
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_LINK_PATH_EXIST],
[
dnl never add -L/usr/libXXX explicitely to libpath
if test "$1" = "default location"; then
ac_path_to_link=""
else
echo "$2" | grep "\-L$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link=""
else
ac_path_to_link=" -L$1"
fi
fi
])
dnl ===========================================================================
dnl C++ features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS(iostream)
if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
AC_LANG_RESTORE
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
dnl
dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_BOOL],
[
AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(
[
],
[
bool b = true;
return 0;
],
[
wx_cv_cpp_bool=yes
],
[
wx_cv_cpp_bool=no
]
)
AC_LANG_RESTORE
])
if test "$wx_cv_cpp_bool" = "yes"; then
AC_DEFINE(HAVE_BOOL)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
dnl keyword and defines HAVE_EXPLICIT if this is the case
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_EXPLICIT],
[
AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
wx_cv_explicit,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
dnl do the test in 2 steps: first check that the compiler knows about the
dnl explicit keyword at all and then verify that it really honours it
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
],
[
return 0;
],
[
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
static void TakeFoo(const Foo& foo) { }
],
[
TakeFoo(17);
return 0;
],
wx_cv_explicit=no,
wx_cv_explicit=yes
)
],
wx_cv_explicit=no
)
AC_LANG_RESTORE
])
if test "$wx_cv_explicit" = "yes"; then
AC_DEFINE(HAVE_EXPLICIT)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CHECK_FUNCS(FUNCTIONS...,
dnl [ACTION-IF-FOUND],
dnl [ACTION-IF-NOT-FOUND],
dnl [EXTRA-DEFINES-AND-INCLUDES],
dnl [EXTRA-TEST-CODE])
dnl
dnl Checks that the functions listed in FUNCTIONS exist in the headers and the
dnl libs. For each function, if it is found then defines 'HAVE_FUNCTION' and
dnl executes ACTION-IF-FOUND, otherwise executes ACTION-IF-NOT-FOUND.
dnl
dnl The code from EXTRA-DEFINES-AND-INCLUDES is inserted into the test before
dnl the default headers are included, and EXTRA-TEST-CODE is inserted into
dnl the main() function after the default test for existence.
dnl
dnl Examples:
dnl # the simple case
dnl WX_CHECK_FUNCS(stat)
dnl # use break to finish the loop early
dnl WX_CHECK_FUNCS(mkstemp mktemp, break)
dnl # extra defines
dnl WX_CHECK_FUNCS(strtok_r, [], [], [#define _RREENTRANT])
dnl # extra includes
dnl WX_CHECK_FUNCS(swprintf, [], [], [#include <wchar.h>])
dnl # checking the signature with extra test code
dnl WX_CHECK_FUNCS(gettimeofday, [], [], [#include <sys/time.h>]
dnl [struct timeval tv; struct timezone tz; gettimeofday(&tv, &tz)])
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CHECK_FUNCS],
[
for wx_func in $1
do
AC_CACHE_CHECK(
[for $wx_func],
[wx_cv_func_$wx_func],
[
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
[
$4
AC_INCLUDES_DEFAULT
],
[
#ifndef $wx_func
&$wx_func;
#endif
$5
])
],
[eval wx_cv_func_$wx_func=yes],
[eval wx_cv_func_$wx_func=no])
])
if eval test \$wx_cv_func_$wx_func = yes
then
AC_DEFINE_UNQUOTED([HAVE_`echo $wx_func | tr 'a-z' 'A-Z'`])
$2
else
:
$3
fi
done
])
dnl ---------------------------------------------------------------------------
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_C_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian,
[ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros
#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
if test $ac_cv_c_bigendian = unknown; then
AC_TRY_RUN([main () {
/* Are we little or big endian? From Harbison&Steele. */
union
{
long l;
char c[sizeof (long)];
} u;
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi])
if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
fi
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)
fi
])
dnl ---------------------------------------------------------------------------
dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_ARG_CACHE_INIT],
[
wx_arg_cache_file="configarg.cache"
echo "loading argument cache $wx_arg_cache_file"
rm -f ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}
])
AC_DEFUN([WX_ARG_CACHE_FLUSH],
[
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
])
dnl this macro checks for a three-valued command line --with argument:
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
AC_DEFUN([WX_ARG_SYS_WITH],
[
AC_MSG_CHECKING([for --with-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
elif test "$withval" = no; then
ac_cv_use_$1='$3=no'
elif test "$withval" = sys; then
ac_cv_use_$1='$3=sys'
elif test "$withval" = builtin; then
ac_cv_use_$1='$3=builtin'
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
elif test "$$3" = no; then
AC_MSG_RESULT(no)
elif test "$$3" = sys; then
AC_MSG_RESULT([system version])
elif test "$$3" = builtin; then
AC_MSG_RESULT([builtin version])
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
])
dnl this macro checks for a command line argument and caches the result
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
AC_DEFUN([WX_ARG_WITH],
[
withstring=$4
AC_MSG_CHECKING([for --${withstring:-with}-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
AC_DEFUN([WX_ARG_ENABLE],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
if test "$enableval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl Like WX_ARG_ENABLE but accepts a parameter.
dnl
dnl Usage:
dnl WX_ARG_ENABLE_PARAM(option, helpmessage, variable-name, enablestring)
dnl
dnl Example:
dnl WX_ARG_ENABLE_PARAM(foo, [[ --enable-foo[=bar] use foo]], wxUSE_FOO)
dnl
dnl --enable-foo wxUSE_FOO=yes
dnl --disable-foo wxUSE_FOO=no
dnl --enable-foo=bar wxUSE_FOO=bar
dnl <not given> value from configarg.cache or wxUSE_FOO=no
dnl
AC_DEFUN([WX_ARG_ENABLE_PARAM],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
wx_cv_use_$1="$3='$enableval'"
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
wx_cv_use_$1='$3='$DEFAULT_$3
else
no_cache=1
wx_cv_use_$1="$3=no"
fi
])
eval "$wx_cv_use_$1"
if test "$no_cache" != 1; then
echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
AC_MSG_RESULT([$$3])
])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
case "${host}" in
*-*-cygwin* | *-*-mingw* )
dnl although ld does support version script option on these
dnl platforms, it doesn't make much sense to use it under Win32
dnl and, moreover, this breaks linking because of a bug in handling
dnl paths in -Wl,--version-script,path option (if we ever do need
dnl to use it for cygwin/mingw32, keep in mind that replacing last
dnl comma with the equal sign works) so
dnl simply disable it
wx_cv_version_script=no
;;
*)
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
dnl There's a problem in some old linkers with --version-script that
dnl can cause linking to fail when you have objects with vtables in
dnl libs 3 deep. This is known to happen in netbsd and openbsd with
dnl ld 2.11.2.
dnl
dnl To test for this we need to make some shared libs and
dnl unfortunately we can't be sure of the right way to do that. If the
dnl first two compiles don't succeed then it looks like the test isn't
dnl working and the result is ignored, but if OTOH the first two
dnl succeed but the third does not then the bug has been detected and
dnl the --version-script flag is dropped.
if test $wx_cv_version_script = yes
then
echo "struct B { virtual ~B() { } }; \
struct D : public B { }; \
void F() { D d; }" > conftest.cpp
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
then
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
then
wx_cv_version_script=yes
else
wx_cv_version_script=no
fi
fi
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
rm -f conftest1.output conftest2.output conftest3.output
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
;;
esac
])
dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl test for availability of iconv()
dnl ---------------------------------------------------------------------------
dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const,
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
extern
#ifdef __cplusplus
"C"
#endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
],
[],
wx_cv_func_iconv_const="no",
wx_cv_func_iconv_const="yes"
)
)
iconv_const=
if test "x$wx_cv_func_iconv_const" = "xyes"; then
iconv_const="const"
fi
AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const,
[Define as const if the declaration of iconv() needs const.])
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
])
dnl ---------------------------------------------------------------------------
dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
dnl ---------------------------------------------------------------------------
dnl WX_SYS_LARGEFILE_TEST
dnl
dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
dnl arithmetic properly but this failed miserably with gcc under Linux
dnl whereas the system still supports 64 bit files, so now simply check
dnl that off_t is big enough
define(WX_SYS_LARGEFILE_TEST,
[typedef struct {
unsigned int field: sizeof(off_t) == 8;
} wxlf;
])
dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
define(WX_SYS_LARGEFILE_MACRO_VALUE,
[
AC_CACHE_CHECK([for $1 value needed for large files], [$3],
[
AC_TRY_COMPILE([#define $1 $2
#include <sys/types.h>],
WX_SYS_LARGEFILE_TEST,
[$3=$2],
[$3=no])
]
)
if test "$$3" != no; then
wx_largefile=yes
AC_DEFINE_UNQUOTED([$1], [$$3])
fi
])
dnl AC_SYS_LARGEFILE
dnl ----------------
dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work.
dnl For more details about this brain damage please see:
dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
AC_DEFUN([AC_SYS_LARGEFILE],
[AC_ARG_ENABLE(largefile,
[ --disable-largefile omit support for large files])
if test "$enable_largefile" != no; then
dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
dnl _LARGE_FILES -- for AIX
wx_largefile=no
WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
if test "x$wx_largefile" != "xyes"; then
WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
fi
AC_MSG_CHECKING(if large file support is available)
if test "x$wx_largefile" = "xyes"; then
AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
fi
AC_MSG_RESULT($wx_largefile)
fi
])
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_const_cast.html
dnl
AC_DEFUN([AC_CXX_CONST_CAST],
[AC_CACHE_CHECK(whether the compiler supports const_cast<>,
ac_cv_cxx_const_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(,[int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;],
ac_cv_cxx_const_cast=yes, ac_cv_cxx_const_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_const_cast" = yes; then
AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
fi
])
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_reinterpret_cast.html
AC_DEFUN([AC_CXX_REINTERPRET_CAST],
[AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>,
ac_cv_cxx_reinterpret_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 () {} };
class Unrelated { public : Unrelated () {} };
int g (Unrelated&) { return 0; }],[
Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);],
ac_cv_cxx_reinterpret_cast=yes, ac_cv_cxx_reinterpret_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_reinterpret_cast" = yes; then
AC_DEFINE(HAVE_REINTERPRET_CAST,,
[define if the compiler supports reinterpret_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
])
dnl http://autoconf-archive.cryp.to/ac_cxx_dynamic_cast.html
AC_DEFUN([AC_CXX_DYNAMIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
ac_cv_cxx_dynamic_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 () {} };],[
Derived d; Base& b=d; return dynamic_cast<Derived*>(&b) ? 0 : 1;],
ac_cv_cxx_dynamic_cast=yes, ac_cv_cxx_dynamic_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_dynamic_cast" = yes; then
AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>])
fi
])

23
aclocal.m4 vendored
View File

@@ -1,23 +0,0 @@
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_include([build/aclocal/bakefile-lang.m4])
m4_include([build/aclocal/bakefile.m4])
m4_include([build/aclocal/cppunit.m4])
m4_include([build/aclocal/gtk-2.0.m4])
m4_include([build/aclocal/gtk.m4])
m4_include([build/aclocal/pkg.m4])
m4_include([build/aclocal/sdl.m4])
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
m4_include([acinclude.m4])

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #00C000",
" c None",
/* pixels */
" ....... ",
" .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" ...... .XXXXX. ",
" ...... .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" .XX........ ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XX........ ",
" .X. ",
" .. ",
" . ",
" "};

View File

@@ -1,57 +0,0 @@
/* XPM */
static char *cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",
"y c #547B99",
"$ c #FFFFFF",
"@ c #839CB5",
"o c #547897",
"4 c #4D7492",
"% c #F1F4F7",
"X c #5A809C",
"< c #8497A5",
"0 c #7898AD",
"+ c #CAD2DC",
"r c #ACAEB2",
"2 c #BECAD9",
"* c #65839D",
"e c #DCE2EA",
"- c #ADBED2",
"t c #597B9A",
" c None",
"1 c #467291",
"9 c #D6DFE7",
"O c #7393AB",
"u c #49708B",
"5 c #A0BACB",
"& c #AABFCD",
"8 c #B9CBD5",
"; c #B4C4D3",
": c #6F90A6",
"3 c #A8B6CA",
"# c #ADBACE",
"w c #E4E9ED",
". c #8EA9BC",
"> c #B3BFD1",
", c #C2CBDB",
"6 c #C0D1DC",
"7 c #A2B3C5",
"q c #5D7C93",
/* pixels */
" .XooOo+ ",
" X@#$$$%o& ",
" *=-;$$$$$o+ ",
" +O#;-$$$$$$: ",
" o=>,-<1<$2-o ",
" o3>--1$122-* ",
" o=--$<4<22-X ",
" o5$$$$$26;7* ",
" X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ",
" X8628>22222<<*4",
" ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u"
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *copy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"o c #97C4E7",
"* c #FFFFFF",
"@ c #60A9DA",
"= c #D1E5F5",
"& c #C3DDF1",
". c #7EA6C0",
" c None",
"X c #2F93CD",
"O c #85BBE2",
", c #EFF6FC",
"; c #DEEDF8",
"+ c #72B2DD",
"3 c #F7FBFD",
"4 c #FAFCFE",
": c #DAEAF7",
"< c #E9F3FA",
"1 c #E2EFF8",
"- c #FDFDFE",
"% c #B6D5EE",
"$ c #A5CCEA",
"> c #E5F0F9",
"# c #AFD1EC",
"2 c #F4F9FD",
/* pixels */
" .....XX ",
" .oO+@X#X ",
" .$oO+X##X ",
" .%$o........ ",
" .&%$.*=&#o.-. ",
" .=&%.*;=&#.--. ",
" .:=&.*>;=&.... ",
" .>:=.*,>;=&#o. ",
" .<1:.*2,>:=&#. ",
" .2<1.*32,>:=&. ",
" .32<.*432,>:=. ",
" .32<.*-432,>:. ",
" .....**-432,>. ",
" .***-432,. ",
" .......... "
};

View File

@@ -1,17 +0,0 @@
/* XPM */
static char *cross_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
" c Gray0",
"# c None",
/* pixels */
" ######## ",
" #### ",
"# ## #",
"## ##",
"### ###",
"### ###",
"## ##",
"# ## #",
" #### ",
" ###### "};

View File

@@ -1,46 +0,0 @@
/* XPM */
static char *cut_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"6 c #D8BDC0",
": c #C3C3C4",
"- c #FFFFFF",
". c #6C6D70",
"2 c #AD3A45",
"o c #DBDBDB",
"# c #939495",
"< c #E42234",
"& c #C3C5C8",
"; c #C6CCD3",
"% c #B7B7B8",
" c None",
"* c #DFE0E2",
"5 c #B69596",
"3 c #9C2A35",
"1 c #CFCFD0",
", c #AB5C64",
"+ c #D2D3D4",
"$ c #BCBDBE",
"@ c #C6C8CA",
"> c #CDC0C1",
"O c #826F72",
"X c #979BA0",
"4 c #9B8687",
"= c #9FA0A0",
/* pixels */
" .X .o ",
" O.+ @. ",
" O. .. ",
" O#$ %.& ",
" O.*.. ",
" #%#.. ",
" O=-.. ",
" #%#;. ",
" OO:=O ",
" >,,<, ,<,,1 ",
" ><23<1 1<32<1 ",
" ,2 4< <5 2, ",
" <, ,2 2, ,< ",
" 23,<5 5<,32 ",
" 6225 522> "
};

View File

@@ -1,54 +0,0 @@
/* XPM */
static char *deffile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 32 1",
"= c #97C4E7",
": c #72A8D2",
"1 c #FFFFFF",
"w c #839CB5",
"X c #6B98B8",
". c #5A89A6",
"@ c #3A749C",
", c #D1E5F5",
"< c #67A1CF",
"> c #F1F4F7",
"e c #85A7BC",
"% c #C3DDF1",
"0 c #749BB4",
"2 c #7EA6C0",
"; c #5F9BC8",
" c None",
"O c #538DB3",
"- c #85BBE2",
"$ c #D6DFE7",
"9 c #EFF6FC",
"o c #6591AE",
"4 c #F7FBFD",
"8 c #FAFCFE",
"6 c #DAEAF7",
"7 c #E9F3FA",
"q c #FDFDFE",
"3 c #E2EFF8",
"# c #8EA9BC",
"& c #B6D5EE",
"* c #A5CCEA",
"5 c #F4F9FD",
"+ c #4581AA",
/* pixels */
" ..XooO+@#$ ",
" .%%&*=-;:;> ",
" .,,%&*=<1=X> ",
" #%%%%&*211=X ",
" #3-----<oXoO ",
" #3456,%&*=-O ",
" #3--------=O ",
" #355736,%&*o ",
" #3--------&o ",
" #38459736,%X ",
" #3--------,0 ",
" #31q84597360 ",
" #3--------3w ",
" #3111q84597e ",
" ##########e# ",
" "
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *delbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
" c None",
"X c #FF4040",
/* pixels */
" ....... ",
" .XXXXX. ",
" . . .XXXXX. ",
" .. .. .XXXXX. ",
" ... .XXXXX. ",
" . .XXXXX. ",
" ... .XXXXX. ",
" .. .. .XXXXX. ",
" . . .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *delete_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"2 c #A5AEBD",
"* c #5478B4",
"< c #95A3BB",
"O c #9AA7BC",
"; c #758EB7",
"$ c #6986B6",
"# c #4971B2",
"& c #8A9CBA",
"X c #8598B9",
" c None",
"o c #ABB2BE",
"- c #7F95B9",
"= c #4E74B3",
"1 c #A0ABBC",
"+ c #6F8AB7",
". c #B5B9BF",
"@ c #3E69B1",
", c #90A0BA",
": c #6483B5",
"> c #5A7BB4",
"% c #5F7FB5",
/* pixels */
" ",
" .Xo OO ",
" +@#. $@% ",
" &@@X .*@*o ",
" =@= .*@*. ",
" -@@X*@*. ",
" .#@@@$. ",
" ;@@: ",
" ;@@@+ ",
" .>@#%@@. ",
" o*@*oO@@, ",
" <#@*. .@@= ",
"&@@$ :@@1 ",
";#& 2#>. ",
" "
};

View File

@@ -1,52 +0,0 @@
/* XPM */
static char *dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"o c #9AEA53",
"7 c #94A5BD",
"8 c #547897",
"5 c #839CB5",
"@ c #376485",
"$ c #5A809C",
"# c #7F99B4",
": c #D1D9E5",
"< c #EAEDF3",
"& c #446A8C",
"q c #65839D",
"> c #DCE2EA",
", c #E1E6EE",
"2 c #F5F6F7",
"O c #8DA0B9",
" c None",
"% c #467291",
". c #305F81",
"X c #7393AB",
"+ c #6A89A2",
"4 c #A8B6CA",
"1 c #EEF1F3",
"3 c #F8F9FA",
"0 c #215579",
"9 c #7F97B0",
"* c #B3BFD1",
"w c #7A90AC",
"- c #C2CBDB",
"; c #CAD6E1",
"= c #BBC4D6",
/* pixels */
" .. ",
" X.o. ",
".... X.ooo. ",
".OO+....ooooo. ",
".OOOOOO@@ooo.. ",
".OOOO#OO@ooo.$ ",
".OOOOOOO@ooo.$ ",
".O%............&",
".O&*=-;:>,<1231.",
".+.4*=-;:>,<12$.",
"..564*=-;:>,<1. ",
".@O764*=-;:>,<. ",
".89O764*=-;:>$$ ",
"0qw9O764*=-;:. ",
"0............. "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * down_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ...... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ....XXXX.... ",
" .XXXXXXXX. ",
" .XXXXXX. ",
" .XXXX. ",
" .XX. ",
" .. ",
" "};

View File

@@ -1,73 +0,0 @@
/* XPM */
static char *exefile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 51 1",
"% c #E8E8EC",
"= c #E8E8ED",
"z c #CACAD4",
"8 c #D9D9E1",
"p c #D2D2DA",
"u c #E1E1E7",
"a c #D2D2DB",
"< c #E9E9ED",
"q c #DADAE1",
"+ c #F1F1F4",
"g c #D3D3DB",
"1 c #E2E2E8",
"x c #D3D3DC",
"5 c #00A5FF",
"$ c #EAEAEE",
"4 c #DBDBE2",
"h c #CCCCD6",
"y c #D4D4DC",
"r c #E3E3E9",
"d c #D4D4DD",
"7 c #DCDCE2",
": c #EBEBEF",
"0 c #DCDCE3",
" c None",
"O c #F3F3F5",
"> c #E4E4E9",
"& c #F3F3F6",
"j c #D5D5DD",
"6 c #E4E4EA",
". c #C6C6D5",
"# c #ECECF0",
"f c #CECED7",
"l c #CECED8",
"e c #D6D6DE",
"; c #EDEDF0",
"3 c #DEDEE4",
", c #EDEDF1",
"c c #CFCFD8",
"o c #F5F5F7",
"- c #E6E6EB",
"w c #D7D7DF",
"v c #C8C8D3",
"i c #DFDFE5",
"@ c #EEEEF2",
"s c #D0D0D9",
"X c #9494AD",
"9 c #D8D8DF",
"t c #D8D8E0",
"* c #EFEFF2",
"2 c #E0E0E6",
"k c #D1D1DA",
/* pixels */
" ........X ",
" .oO+@#$%XX ",
" .&+*#$=-XXX ",
" .+*;:=->XXXX ",
" .*,:<->1234X ",
" .,5:5612378X ",
" 5,5559530qwX ",
" 55555550q9eX ",
" 5555r5555teyX ",
" 55rui559eypX ",
" 5555i5555yasX ",
" 5555555dasfX ",
" 5355595gsfhX ",
" .3595jgklhzX ",
" .0qwjxkchzvX ",
" XXXXXXXXXXXX "
};

View File

@@ -1,57 +0,0 @@
/* XPM */
static char *fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"6 c #9BACC2",
"< c #9AEA53",
"9 c #94A5BD",
"5 c #839CB5",
"; c #4D7492",
". c #376485",
"$ c #7F99B4",
"r c #D1D9E5",
"7 c #EAEDF3",
"@ c #CAD2DC",
"% c #718BA7",
"t c #BECAD9",
"& c #65839D",
"0 c #DCE2EA",
"4 c #F5F6F7",
"w c #597B9A",
"O c #8DA0B9",
" c None",
"+ c #467291",
"u c #305F81",
"= c #B4C4D3",
"# c #CAE2AA",
"1 c #FAFCFE",
"3 c #A8B6CA",
"q c #E4E9ED",
"8 c #EEF1F3",
"X c #215579",
"2 c #7F97B0",
": c #B3BFD1",
"y c #7A90AC",
", c #C2CBDB",
"- c #ADD668",
"* c #B6D791",
"e c #CAD6E1",
"o c #DFF0D0",
"> c #BBC4D6",
/* pixels */
" ",
" .... ",
"XXXXX .oo. ",
"XOOOO+@.#o. ",
"XOOOO$%&.*oXXX ",
"XOOOOOOO.*oX=X ",
"XOXXXX...-oXXXX;",
"XOX:>,.<<<<<oX1;",
"X2X3:>,.<<<oX4=;",
"XX563:>>.<oX78; ",
"XXO963:>>.X0q7; ",
"Xw2O963:>>er0t; ",
"X&y2O963:>,er; ",
"uXXXXXXXXXXXX; ",
" "
};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *filesave_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"O c #FFFFFF",
"> c #D5D6D8",
"; c #446A8C",
"1 c #CAD2DC",
": c #C0C7D1",
" c #5F666D",
"% c #A5B0BA",
"o c #65839D",
", c #DCE2EA",
"< c #C3C5C8",
"- c #E1E6EE",
"* c #C6CCD3",
". c None",
"$ c #305F81",
"2 c #D6DFE7",
"= c #D2D9E0",
"& c #B7BFC7",
"X c #1B4467",
"# c #BCBDBE",
"@ c #7A90AC",
"+ c #5D7C93",
/* pixels */
" .",
" XoOOOOOOOOO+X .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @@+++++++++@@ .",
" @@@@@@@@@@@@@ .",
" @@@$$$$$$$$@@ .",
" @@$%%%&*=-O$@ .",
" @@$%X;;*=-O$@ .",
" @@$%X;;:>,O$@ .",
" @@$%X;;<12O$@ .",
" @@$<<2OOOOO$@ .",
". .."
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"X c Black",
"+ c #FFFFFF",
"< c #D5D6D8",
"> c #446A8C",
"3 c #CAD2DC",
", c #C0C7D1",
" c #5F666D",
"* c #A5B0BA",
"O c #65839D",
"1 c #DCE2EA",
"2 c #C3C5C8",
": c #E1E6EE",
". c #FFFF00",
"- c #C6CCD3",
"@ c None",
"& c #305F81",
"4 c #D6DFE7",
"; c #D2D9E0",
"= c #B7BFC7",
"o c #1B4467",
"$ c #BCBDBE",
"# c #7A90AC",
"% c #5D7C93",
/* pixels */
" .X .XX.",
" oO+++++++.X.X.@",
" #O+$$$$$XX...XX",
" #O++++++.......",
" #O+$$$$$XX...XX",
" #O+++++++.X.X.@",
" ##%%%%%%.X%.X .",
" ############# @",
" ###&&&&&&&&## @",
" ##&***=-;:+&# @",
" ##&*o>>-;:+&# @",
" ##&*o>>,<1+&# @",
" ##&*o>>234+&# @",
" ##&224+++++&# @",
"@ @@"
};

View File

@@ -1,62 +0,0 @@
/* XPM */
static char *find_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 41 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"3 c #DEF1FA",
"= c #4CBCE3",
"d c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy ",
" yasdy ",
" yasdy ",
" ysdy ",
" yy "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *findrepl_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 42 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"d c #008000",
"3 c #DEF1FA",
"= c #4CBCE3",
"f c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy d d ",
" yasfy dd dd ",
"yasfy ddddddddd",
"ysfy dd dd ",
" yy d d "
};

View File

@@ -1,39 +0,0 @@
/* XPM */
static char *floppy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 18 1",
"& c #E3E4E6",
"+ c #FFFFFF",
". c #446A8C",
"o c #697787",
"> c #5F666D",
"* c #B2B3B3",
" c None",
", c #4B4C4D",
"= c #DCDBDA",
"$ c #1B4467",
": c #E4E9ED",
"@ c #979BA0",
"X c #203646",
"O c #215579",
"- c #545B63",
"; c #636465",
"# c #CAD6E1",
"% c #7F8286",
/* pixels */
" .XoooooooXO ",
" .o+++++++.O ",
" .o+OOOOO+.O ",
" .o+++++++.O ",
" .o@@@@@@@.O ",
" ..........O ",
" ..#+++++#.O ",
" ..+$O+++#.O ",
" ..+$O+++#.O ",
" %&.........*% ",
"%=+++++++++++&% ",
"--------------; ",
"-:::::::::::::- ",
"-:X:XXXXXXXXX:> ",
"-*************, "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *folder_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"> c #9BACC2",
". c #547897",
"1 c #7F99B4",
"X c #D1D9E5",
"< c #EAEDF3",
"+ c #CAD2DC",
"3 c #718BA7",
"O c #BECAD9",
"$ c #E1E6EE",
"* c #F5F6F7",
", c #8DA0B9",
" c None",
"# c #D6DFE7",
"@ c #D2D9E0",
"- c #FAFCFE",
"; c #ADBACE",
"& c #EEF1F3",
"= c #F8F9FA",
"o c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"% c #E5EAF1",
/* pixels */
" ",
" ..... ",
" .XXXX. ",
" ............. ",
" .oO+@#$%&*=-. ",
" .oO+@#$%&*=-. ",
" .;oO+X#$%&*=. ",
" .:;oO+X#$%&*. ",
" .>:;oO+X#$%&. ",
" .,>:;oO+X#$<. ",
" .1,>:;oO+X#$. ",
" .21,>:;oO+X#. ",
" .321,>:;oO+X. ",
" ............. ",
" "
};

View File

@@ -1,52 +0,0 @@
/* XPM */
static char *folder_open_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"w c #547B99",
"5 c #94A5BD",
". c #376485",
"; c #F1F4F7",
"o c #7F99B4",
"2 c #D1D9E5",
"- c #EAEDF3",
"O c #718BA7",
"0 c #65839D",
"* c #DCE2EA",
": c #F5F6F7",
"7 c #597B9A",
"X c #8DA0B9",
" c None",
"+ c #467291",
"q c #305F81",
"& c #D6DFE7",
"3 c #6A89A2",
"1 c #A8B6CA",
"= c #E4E9ED",
"> c #F8F9FA",
", c #FDFDFE",
"9 c #215579",
"8 c #7F97B0",
"@ c #B3BFD1",
"< c #7A90AC",
"$ c #C2CBDB",
"4 c #A2B3C5",
"% c #CAD6E1",
"# c #BBC4D6",
/* pixels */
" ",
"..... ",
".XXXo. ",
".XXXXO........ ",
".XXXXXXXXXXXX. ",
".XXXXXXXXXXXX. ",
".X++++++++++++++",
".X+@#$%&*=-;:>,+",
".<.1@#$%2*=-;:23",
"..X41@#$%2*=-;3 ",
"..X561@#$%2*=-3 ",
".78X561@#$%2*%3 ",
"90<8X561@#$%23 ",
"q++++++++++++w ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * forward_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" ........XX. ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" ........XX. ",
" .X. ",
" .. ",
" . ",
" "};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,60 +0,0 @@
/* XPM */
static char *harddisk_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"7 c #E3E4E6",
"4 c #FFFFFF",
"5 c #839CB5",
". c #547897",
"1 c #4D7492",
"@ c #376485",
"o c #7A92A3",
"u c #D1D9E5",
"y c #446A8C",
"i c #51B03D",
"> c #CAD2DC",
"O c #718BA7",
"2 c #65839D",
"6 c #DCE2EA",
"0 c #C3C5C8",
"9 c #F5F6F7",
": c #EBEBEC",
"< c #597B9A",
"t c #C6CCD3",
" c None",
"* c #DFE0E2",
"e c #467291",
"a c #526E8B",
", c #7393AB",
"p c #130A0B",
"# c #AABFCD",
"r c #B4C4D3",
"; c #CFCFD0",
"X c #6F90A6",
"+ c #6A89A2",
"- c #D2D3D4",
"= c #DCDBDA",
"w c #E4E9ED",
"q c #C6C8CA",
"% c #215579",
"$ c #E7E7E7",
"3 c #7F97B0",
"8 c #C0D1DC",
"& c #5D7C93",
/* pixels */
" ",
" .XoooXO+@ ",
" #$$%%%%$$$X ",
" &$*==-;$$$& ",
" &:>+,<1234o5 ",
" ###+67;;78242 ",
" &4,49*0q*9we4. ",
" &4+49*,,*9wo4. ",
"&4%r,67;;782t%4.",
"&44468rrrr84444,",
"y11111111111111e",
"1uu1:::::::::::1",
"1uu1::::::::ip:1",
"auu&:::::::::::1",
"1111111111111111"
};

View File

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

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *home_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #FFFFFF",
" c None",
/* pixels */
" .... ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXXXX. ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .X.....X....X. ",
" .X. .X. .X. ",
" .X. .X. .X. ",
" .X.....X. .X. ",
" .XXXXXXX. .X. ",
" ......... ... "
};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmbook_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmfoldr_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

View File

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

View File

@@ -1,23 +0,0 @@
/* XPM */
static char * htmpage_xpm[] = {
"16 16 4 1",
" c None",
". c #808080",
"X c Gray100",
"o c Black",
" ",
" .......... ",
" .XXXXXXXX.. ",
" .XXXXXXXXooo ",
" .X......XXXo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .XXXXXXXXXXo ",
" oooooooooooo "};

View File

@@ -1,27 +0,0 @@
/* XPM */
static char *htmsidep_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
". c Black",
"X c #FFFFFF",
"+ c #808080",
" c None",
"O c #0000C0",
"o c #C0C0C0",
/* pixels */
" ",
" .............. ",
" .XXXX.ooooooo. ",
" .XOXX.oo...oo. ",
" .XXOX.ooooooo. ",
" .OOOO.o...+.o. ",
" .XXOX.ooooooo. ",
" .XOXX.ooooooo. ",
" .XXXX.o..+ooo. ",
" .XXOX.ooooooo. ",
" .XOXX.o...+.o. ",
" .OOOO.ooooooo. ",
" .XOXX.o.+...o. ",
" .XXOX.ooooooo. ",
" .............. "
};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char *listview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Black",
". c #FFFFFF",
"X c #000084",
"o c #848484",
/* pixels */
" ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *missimg_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 5 1",
"X c Black",
"o c #FFFFFF",
" c None",
". c #C0C0C0",
"O c #E0E0E0",
/* pixels */
" .............................X ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
" XXXXX XOOOOOOOOOOOOOOooX ",
" XOOOXXXOOOOOOOooX ",
" XXX XXOOOOOooX ",
" XOOOOooX ",
" . XOOOooX ",
" .. XXOooX ",
" .o.. XooX ",
" .ooO... XXX ",
" .ooOOOO.......... ",
" .ooOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOOOO......... ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,50 +0,0 @@
/* XPM */
static char *new_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 29 1",
"* c #97C4E7",
"- c #72A8D2",
": c #FFFFFF",
"9 c #839CB5",
"o c #6B98B8",
"X c #5A89A6",
"# c #3A749C",
", c #D1E5F5",
"0 c #85A7BC",
"$ c #C3DDF1",
"8 c #749BB4",
"; c #5F9BC8",
" c None",
"+ c #538DB3",
"= c #85BBE2",
"3 c #EFF6FC",
"O c #6591AE",
"5 c #F7FBFD",
"7 c #FAFCFE",
"< c #DAEAF7",
"4 c #E9F3FA",
"6 c #FDFDFE",
"1 c #E2EFF8",
". c #8EA9BC",
"% c #B6D5EE",
"& c #A5CCEA",
"> c #ACE95B",
"2 c #F4F9FD",
"@ c #4581AA",
/* pixels */
" .XoOO+@#. ",
" .$$%&*=O-; ",
" @@@@$%&*O:*o ",
" @>>@$$%&O::*o ",
"@@@>>@@@$%OOoO+ ",
"@>>>>>>@,$%&*=+ ",
"@>>>>>>@<,$%&*+ ",
"@@@>>@@@1<,$%&O ",
" @>>@2341<,$%O ",
" @@@@52341<,$o ",
" .:6752341<,8 ",
" .::6752341<8 ",
" .:::67523419 ",
" .::::6752340 ",
" ............ "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"X c Black",
"> c #9BACC2",
"o c #547897",
"1 c #7F99B4",
"O c #D1D9E5",
"< c #EAEDF3",
"# c #CAD2DC",
"3 c #718BA7",
"@ c #BECAD9",
"& c #E1E6EE",
"; c #F5F6F7",
". c #FFFF00",
", c #8DA0B9",
" c None",
"% c #D6DFE7",
"$ c #D2D9E0",
"- c #ADBACE",
"= c #EEF1F3",
"+ c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"* c #E5EAF1",
/* pixels */
" .X .XX.",
" ooooo .X.X. ",
" oOOOOo XX...XX",
" oooooooo.......",
" o+@#$%&*XX...XX",
" o+@#$%&*=.X.X. ",
" o-+@#O%&.X;.X .",
" o:-+@#O%&*=;o ",
" o>:-+@#O%&*=o ",
" o,>:-+@#O%&<o ",
" o1,>:-+@#O%&o ",
" o21,>:-+@#O%o ",
" o321,>:-+@#Oo ",
" ooooooooooooo ",
" "
};

View File

@@ -1,46 +0,0 @@
/* XPM */
static char *paste_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"< c #FEECE4",
"> c #FEE3D7",
"O c #FFFFFF",
"o c #7B767D",
"% c #F79586",
"& c #CAE1F3",
"@ c #F08B62",
"# c #FCCBB8",
"- c #FDD8C9",
"4 c #FFF8F4",
"5 c #FFF5F0",
" c None",
"$ c #F8AA8F",
", c #EFF6FC",
"1 c #F7FBFD",
"2 c #FAFCFE",
"; c #DAEAF7",
": c #E9F3FA",
"6 c #FFFAF8",
". c #3C78A6",
"3 c #FFF1ED",
"X c #9B8687",
"+ c #FBBCA4",
"* c #B6D5EE",
"= c #F4F9FD",
/* pixels */
" ...... ",
" .XoOOOOoo. ",
".+XOOOOOOX@. ",
".+XXXXXXXX@. ",
".#++$$%@..... ",
".##++$$%.&*.=. ",
".-##++$$.;&.==. ",
".--##++$.:;.... ",
".>--##++.,:;&*. ",
".<>--##+.1,:;&. ",
".<<>--##.21,:;. ",
".3<<>--#.O21=:. ",
".45<<>--....... ",
".6453<>----. ",
"............ "
};

View File

@@ -1,60 +0,0 @@
/* XPM */
static char *print_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"< c #E3E4E6",
"+ c #C3C3C4",
"i c #FFFFFF",
": c #74879B",
"# c #5A89A6",
"a c #F1F4F7",
"r c #5A809C",
"@ c #BDCCD9",
"e c #7A92A4",
"% c #3F6F93",
"t c #9FA2A6",
"3 c #939495",
"w c #5F666D",
"9 c #65839E",
"5 c #4A7291",
"$ c #4B7F9E",
" c None",
"O c #DFE0E2",
"o c #F3F3F3",
"; c #84A5BB",
"& c #467291",
". c #7897AD",
"* c #407598",
"4 c #CFCFD0",
"7 c #6F90A6",
"y c #6A89A2",
"0 c #AAADB2",
"1 c #D2D3D4",
"u c #4F7592",
", c #BCBDBE",
"p c #57778E",
"q c #979BA0",
"2 c #ABABAC",
"- c #E7E7E7",
"= c #D6DEE6",
"> c #9FA0A0",
"8 c #829EB5",
"X c #8FB0C3",
"6 c #5D7C93",
/* pixels */
" .XXXXXXXX ",
" .oooooooX ",
" .OOOOOOOX ",
" .+++++++X ",
"@##$%&&&&&%*##@ ",
"$=-;:>,<123$-=$ ",
".44.5678.96$44. ",
"7,,,,,,,,,,,,,7 ",
"900qwwwwwwwe009 ",
"rtt9ryyyyyyuttr ",
"6qq6iiiiiii%qq6 ",
"633paiiiiii%336 ",
"XXX*iiiiiii%XXX ",
" 6iiiiiii% ",
" $XXXXXXX# "
};

View File

@@ -1,90 +0,0 @@
/* XPM */
static char *quit_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 69 1",
"@ c Black",
"i c #9AEA53",
"D c #7E9BB1",
"H c #839FB4",
", c #B7C7D3",
"8 c #BCCBD6",
"7 c #C1CFDA",
"v c #92ABBD",
"- c #D0DBE2",
"O c #547897",
"+ c #376485",
"L c #7090A8",
"t c #AEC0CE",
"g c #B3C4D1",
"S c #84A0B4",
"G c #89A4B8",
"> c #BDCCD7",
"F c #5A809C",
"2 c #C2D0DA",
"k c #93ACBE",
"= c #D6E0E6",
"* c #446A8C",
"z c #A5B9C8",
"# c #DEE5EB",
"0 c #AFC1CE",
"r c #B4C5D2",
"p c #B9C9D5",
"A c #8AA5B8",
"M c #92AABD",
"j c #A6BAC9",
"K c #7796AC",
"l c #ABBECC",
"o c #E4EAEF",
"9 c #B5C6D2",
" c None",
"; c #C9D6DF",
"X c #305F81",
"m c #98AFC0",
"V c #9DB3C3",
"% c #D1DBE3",
"u c #A2B7C6",
"y c #A7BBCA",
"h c #ACBFCD",
"4 c #B6C7D3",
"w c #C0CFD9",
"d c #982106",
"B c #85A0B5",
"6 c #C8D4DE",
"c c #99B0C1",
"x c #9EB4C4",
"$ c #D7E0E7",
"q c #A8BCCA",
"s c #ADC0CD",
"3 c #BCCCD7",
"N c #8BA5B9",
": c #C4D1DB",
"1 c #C9D5DE",
"f c #9AB1C2",
"n c #A4B9C8",
"a c #B3C5D1",
". c #215579",
"J c #7D9AB0",
"& c #829EB5",
"e c #BBCAD6",
"b c #8CA6B9",
"Z c #91AABC",
"C c #96AEC0",
"< c #CFDAE2",
"5 c #AFC2CF",
/* pixels */
" ..XXXXXXXXXX ",
" XoO+X@@@@@@X ",
" X#$%&X*@@@@X ",
" X=-;:>,X@@@X ",
" X<12345X@@@X ",
" X67890qX@XXX ",
" XwertyuX@XiX ",
" XpasddfX++iiX ",
" XghjddkXiiiiiX ",
" XlzxcvbXiiiiiiX",
" XnxmMNBXiiiiiX ",
" XVCZASDXXXiiX ",
" XXFGHJKX XiX ",
" FXXFLX XX ",
" XX* "
};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *redo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"; c #4C7398",
"3 c #547B99",
"* c #547897",
"# c #5A89A6",
"8 c #3A749C",
"5 c #5A809C",
", c #7F99B4",
"& c #3F6F93",
"9 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"e c #A5B3C8",
"w c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"o c #236289",
"r c #ADBED2",
"= c #597B9A",
"2 c #8DA0B9",
" c None",
"% c #467291",
"1 c #7393AB",
"i c #4C809F",
"- c #A0BACB",
"O c #6591AE",
"X c #407598",
"6 c #6F90A6",
"t c #D2D9E0",
"7 c #ADBACE",
"@ c #326A8F",
"0 c #467A9C",
". c #ACC4D3",
"< c #7F97B0",
"y c #B3BFD1",
"q c #A2B3C5",
"$ c #8FB0C3",
/* pixels */
" .XoooO ",
" +o@@@@@o# +",
" $@%%&@&%%&@ +o",
" X*=@+-+@*=;@#&@",
" @:=+ @=:=*:@",
" &>:$ @:>>>@",
" &,<X X>,,,&",
" +123 @<2222&",
" X44X #@56<44X",
" O1748 .9#&o",
" 0qwe8 ",
" 8rty8 ",
" 8wu+ ",
" i## ",
" "
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *removable_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"@ c #C3C3C4",
"4 c #FFFFFF",
"o c #D5D6D8",
"> c #7A92A3",
". c #8497A5",
"% c #ACAEB2",
"2 c #4A7898",
": c #DCE2EA",
", c #F5F6F7",
"= c #EBEBEC",
"$ c #B7B7B8",
" c None",
"X c #DFE0E2",
"* c #A6A8AD",
"1 c #4C809F",
"3 c #407598",
"O c #CFCFD0",
"; c #9EA2A8",
"# c #BCBDBE",
"+ c #C6C8CA",
"- c #979BA0",
"& c #E7E7E7",
"< c #8FB0C3",
/* pixels */
" ......... ",
" .XoO+@#$%. ",
" .XoO+@#$%. ",
" .&XoO+@#$%*. ",
" .&XoO+@#$%*. ",
" .=&XoO+@#$%*-. ",
" .=&XoO+@#$%*;. ",
".:=&XoO+@#$%*;>.",
".,=&XoO+@#$%*;-.",
"<..............<",
"<,=&XoO+@#$%%%%.",
"<O1111122233*4*.",
"<OOOOOOOOOOO***.",
" <<<<<<<<<<<<<< ",
" "
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *repview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Black",
"X c #FFFFFF",
". c #C0C0C0",
/* pixels */
" ",
" .............. ",
" . . . . ",
" .............. ",
" .............. ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" "
};

View File

@@ -1,17 +0,0 @@
/* XPM */
static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
". c Gray0",
" c None",
/* pixels */
" ",
" ..",
" ...",
" ... ",
".. ... ",
"... ... ",
" ..... ",
" ... ",
" . ",
" "};

View File

@@ -1,47 +0,0 @@
/* XPM */
static char *tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * toparent_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX..... ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .......... ",
" "};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *undo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"* c #4C7398",
"2 c #547B99",
"- c #547897",
"@ c #5A89A6",
"8 c #3A749C",
"6 c #5A809C",
", c #7F99B4",
"$ c #3F6F93",
"7 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"0 c #A5B3C8",
"q c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"X c #236289",
"y c #ADBED2",
"= c #597B9A",
"1 c #8DA0B9",
" c None",
"% c #467291",
"3 c #7393AB",
"i c #4C809F",
"; c #A0BACB",
". c #6591AE",
"o c #407598",
"5 c #6F90A6",
"t c #D2D9E0",
"9 c #ADBACE",
"# c #326A8F",
"e c #467A9C",
"O c #ACC4D3",
"< c #7F97B0",
"r c #B3BFD1",
"w c #A2B3C5",
"& c #8FB0C3",
/* pixels */
" .XXXoO ",
"+ @X#####X+ ",
"X+ #$%%$#$%%#& ",
"#$@#*=-#+;+#=-o ",
"#:-=:=# +=:# ",
"#>>>:# &:>$ ",
"$,,,>o o<,$ ",
"$1111<# 213+ ",
"o44<56#@ o44o ",
"X$@7O 8493. ",
" 80qwe ",
" 8rty8 ",
" +uq8 ",
" @@i ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * up_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ...... ",
" "};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

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

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -1 +0,0 @@
wince

View File

@@ -1,27 +0,0 @@
autogen.mk
autogen.mk is a makefile provided to automatically update the GNU autotools
build system. It will run Bakefile, aclocal, and autoconf as appropriate.
The .m4 files required for running aclocal are located in build/aclocal.
When upgrading software that wxWidgets depends on (for example, Bakefile,
cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
located in the build/aclocal directory.
It is particularly important that if you use a newer version of Bakefile
to generate the Makefile.in files that you use the newer bakefile*.m4.
Because build/autogen.mk is a Makefile it will automatically rerun
aclocal and autoconf as necessary whenever any m4 in build/aclocal is
newer than the generated aclocal.m4.
You can achieve this simply by copying the new bakefile*.m4 files from
PREFIX/share/aclocal/ into the build/aclocal/ directory and
rerunning make -f build/autogen.mk. Note that you should _not_ preserve
source file times (don't use cp -p) or else it's possible your .m4 files
will be older than the generated aclocal.m4).
Example:
cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
make -f build/autogen.mk
Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
configure, and Makefile.in files to wxWidgets.

View File

@@ -1,78 +0,0 @@
dnl @synopsis AC_raf_FUNC_WHICH_GETSERVBYNAME_R
dnl
dnl Provides a test to determine the correct way to call
dnl getservbyname_r:
dnl
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
dnl
dnl An example use can be found at
dnl http://raf.org/autoconf/net_getservbyname.c
dnl
dnl Based on Caolan McNamara's gethostbyname_r macro. Based on David
dnl Arnold's autoconf suggestion in the threads faq.
dnl
dnl @category Misc
dnl @author raf <raf@raf.org>
dnl @version 2001-08-20
dnl @license GPLWithACException
AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
[
AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
ac_cv_func_which_getservbyname_r,
[
dnl we need to use C++ to detect missing prototypes
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se, *res;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen, &res)
],
ac_cv_func_which_getservbyname_r=six,
[
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen)
],
ac_cv_func_which_getservbyname_r=five,
[
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
struct servent_data data;
(void) getservbyname_r(name, proto, se, &data);
],
ac_cv_func_which_getservbyname_r=four,
ac_cv_func_which_getservbyname_r=no
)
]
)
]
)
AC_LANG_POP()
]
)
if test $ac_cv_func_which_getservbyname_r = six; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
elif test $ac_cv_func_which_getservbyname_r = five; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
elif test $ac_cv_func_which_getservbyname_r = four; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
fi
])

View File

@@ -1,155 +0,0 @@
dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
dnl
dnl Determines which historical variant of the gethostbyname_r() call
dnl (taking three, five, or six arguments) is available on the system
dnl and defines one of the following macros accordingly:
dnl
dnl HAVE_FUNC_GETHOSTBYNAME_R_6
dnl HAVE_FUNC_GETHOSTBYNAME_R_5
dnl HAVE_FUNC_GETHOSTBYNAME_R_3
dnl
dnl If used in conjunction with gethostname.c, the API demonstrated in
dnl test.c can be used regardless of which gethostbyname_r() is
dnl available. These example files can be found at
dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
dnl
dnl based on David Arnold's autoconf suggestion in the threads faq
dnl
dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
dnl for Autoconf 2.5x by Daniel Richard G.
dnl
dnl @category InstalledPackages
dnl @author Caolan McNamara <caolan@skynet.ie>
dnl @author Daniel Richard G. <skunk@iskunk.org>
dnl @version 2005-01-21
dnl @license GPLWithACException
AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
AC_LANG_PUSH(C)
AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
################################################################
ac_cv_func_which_gethostbyname_r=unknown
#
# ONE ARGUMENT (sanity check)
#
# This should fail, as there is no variant of gethostbyname_r() that takes
# a single argument. If it actually compiles, then we can assume that
# netdb.h is not declaring the function, and the compiler is thereby
# assuming an implicit prototype. In which case, we're out of luck.
#
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
(void)gethostbyname_r(name) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=no)
#
# SIX ARGUMENTS
# (e.g. Linux)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret, *retp;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=six)
fi
#
# FIVE ARGUMENTS
# (e.g. Solaris)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=five)
fi
#
# THREE ARGUMENTS
# (e.g. AIX, HP-UX, Tru64)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
struct hostent_data data;
(void)gethostbyname_r(name, &ret, &data) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=three)
fi
################################################################
]) dnl end AC_CACHE_VAL
case "$ac_cv_func_which_gethostbyname_r" in
three)
AC_MSG_RESULT([three])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
;;
five)
AC_MSG_RESULT([five])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
;;
six)
AC_MSG_RESULT([six])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
;;
no)
AC_MSG_RESULT([cannot find function declaration in netdb.h])
;;
unknown)
AC_MSG_RESULT([can't tell])
;;
*)
AC_MSG_ERROR([internal error])
;;
esac
AC_LANG_POP(C)
]) dnl end AC_DEFUN

View File

@@ -1,258 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl Compiler detection macros by David Elliott
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
dnl ===========================================================================
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
[AC_TRY_COMPILE([],[#ifndef __MWERKS__
choke me
#endif
],
[bakefile_compiler_mwerks=yes],
[bakefile_compiler_mwerks=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
])
])
dnl Loosely based on autoconf AC_PROG_CC
dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
[AC_TRY_COMPILE([],[#ifndef __xlC__
choke me
#endif
],
[bakefile_compiler_xlc=yes],
[bakefile_compiler_xlc=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
])
])
dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
[
AC_LANG_PUSH($2)
AC_CACHE_CHECK(
[whether we are using the $1 $2 compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
[AC_TRY_COMPILE(
[],
[
#ifndef $3
choke me
#endif
],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
)
]
)
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
:; $4
else
:; $5
fi
AC_LANG_POP($2)
])
dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
dnl
dnl NB: old versions define _COMPILER_VERSION but this could probably be
dnl defined by other compilers too so don't test for it to be safe
AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
])
dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
])
dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
])
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
])
dnl Tru64 cc and cxx
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
])
dnl ===========================================================================
dnl macros to detect specialty compiler options
dnl ===========================================================================
dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
dnl First create an empty conf test
[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
dnl Now remove .o and .c.o or .cc.o
rm -f conftest.$ac_objext conftest.$ac_ext.o
dnl Now compile the test
AS_IF([AC_TRY_EVAL(ac_compile)],
dnl If the test succeeded look for conftest.c.o or conftest.cc.o
[for ac_file in `(ls conftest.* 2>/dev/null)`; do
case $ac_file in
conftest.$ac_ext.o)
bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
;;
*)
;;
esac
done],
[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
]) dnl AS_IF
rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
]) dnl AC_CACHE_CHECK
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
if test "[]_AC_LANG_ABBREV[]" = "c"; then
CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
fi
if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
fi
fi
]) dnl AC_DEFUN
dnl ===========================================================================
dnl Macros to do all of the compiler detections as one macro
dnl ===========================================================================
dnl check for different proprietary compilers depending on target platform
dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
[
AC_PROG_$1
AC_BAKEFILE_PROG_INTEL$1
dnl if we're using gcc, we can't be using any of incompatible compilers
if test "x$G$1" != "xyes"; then
if test "x$1" = "xC"; then
AC_BAKEFILE_METROWERKS_EXTO
if test "x$bakefile_cv_c_exto" '!=' "x"; then
unset ac_cv_prog_cc_g
_AC_PROG_CC_G
fi
fi
dnl most of these compilers are only used under well-defined OS so
dnl don't waste time checking for them on other ones
case `uname -s` in
AIX*)
AC_BAKEFILE_PROG_XL$1
;;
Darwin)
AC_BAKEFILE_PROG_MW$1
AC_BAKEFILE_PROG_XL$1
;;
IRIX*)
AC_BAKEFILE_PROG_SGI$1
;;
HP-UX*)
AC_BAKEFILE_PROG_HP$1
;;
OSF1)
AC_BAKEFILE_PROG_COMPAQ$1
;;
SunOS)
AC_BAKEFILE_PROG_SUN$1
;;
esac
fi
])
AC_DEFUN([AC_BAKEFILE_PROG_CC],
[
_AC_BAKEFILE_PROG_COMPILER(CC)
])
AC_DEFUN([AC_BAKEFILE_PROG_CXX],
[
_AC_BAKEFILE_PROG_COMPILER(CXX)
])

File diff suppressed because it is too large Load Diff

View File

@@ -1,81 +0,0 @@
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
AC_MSG_RESULT(no)
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,23 +0,0 @@
dnl Perform a check for a GStreamer element using gst-inspect
dnl Thomas Vander Stichele <thomas at apestaart dot org>
dnl Last modification: 25/01/2005
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK],
[
if test "x$GST_INSPECT" == "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
fi
if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.)
$2
else
AC_MSG_RESULT(not found.)
$3
fi
fi
])

View File

@@ -1,196 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GTK_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes)
pkg_config_args=gtk+-2.0
for module in . $4
do
case "$module" in
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
else
echo "*** pkg-config too old; version 0.7 or better required."
no_gtk=yes
PKG_CONFIG=no
fi
else
no_gtk=yes
fi
min_gtk_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
fi
fi
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent)
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
}
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK+ test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, 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 GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

View File

@@ -1,194 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 97-11-3
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
gtk_config_prefix="$withval", gtk_config_prefix="")
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
, enable_gtktest=yes)
for module in . $4
do
case "$module" in
gthread)
gtk_config_args="$gtk_config_args gthread"
;;
esac
done
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
fi
fi
AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
min_gtk_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
else
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK is sufficiently new. (Also sanity
dnl checks the results of gtk-config to some extent
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
#endif /* defined (GTK_MAJOR_VERSION) ... */
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
printf("*** correct copy of gtk-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GTK_CONFIG" = "no" ; then
echo "*** The gtk-config script installed by GTK could not be found"
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GTK_CONFIG environment variable to the"
echo "*** full path to gtk-config."
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK test program, checking why..."
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
echo "*** version of GTK. If it is not finding GTK, 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 "***"
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
echo "*** came with the system with the command"
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

View File

@@ -1,156 +0,0 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
if test -n "$$1"; then
pkg_cv_[]$1="$$1"
else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES

View File

@@ -1,181 +0,0 @@
# 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
if test "x$prefix" != xNONE; then
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
fi
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_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $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"
CXXFLAGS="$ac_save_CXXFLAGS"
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"
CXXFLAGS="$CXXFLAGS $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"
CXXFLAGS="$ac_save_CXXFLAGS"
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
])

View File

@@ -1,66 +0,0 @@
# Created: 2005/03/12
# Author: David Elliott
# Usage Example:
# make -f build/autogen.mk ACLOCAL=aclocal-1.9
# This is a simple Makefile to update the UNIX build system in such a
# way that doing a cvs diff on its output files should reveal only the
# true changes, not meaningless differences due to slightly different
# autoconf or aclocal m4 files.
# For aclocal: All necessary m4 files are located in the build/aclocal
# directory. Running aclocal -I build/aclocal when using aclocal 1.9
# will result in an aclocal.m4 which uses m4_include for these files.
ACLOCAL=aclocal
AUTOCONF=autoconf
BAKEFILE_GEN=bakefile_gen
AUTOHACKS_PREPEND_INCLUDE_DIR=build/autoconf_prepend-include
# configure depends on everything else so this will build everything.
.PHONY: all
all: configure
.PHONY: autoconf_m4f
# Invoke make on wxAutohacks dir, but don't fail if it's not present
autoconf_m4f:
-make -C $(AUTOHACKS_PREPEND_INCLUDE_DIR)
BAKEFILES=\
build/bakefiles/wx.bkl \
build/bakefiles/common.bkl \
build/bakefiles/files.bkl \
build/bakefiles/monolithic.bkl \
build/bakefiles/multilib.bkl \
build/bakefiles/opengl.bkl \
build/bakefiles/plugins.bkl \
build/bakefiles/build_cfg.bkl
# Run bakefile-gen (which generates everything) whenever a bakefile is newer
# than Makefile.in or autoconf_inc.m4.
# This dep is obviously wrong but probably close enough
autoconf_inc.m4 Makefile.in: $(BAKEFILES)
cd build/bakefiles && \
$(BAKEFILE_GEN) -f autoconf
# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
# Depend on our custom autoconf.m4f
configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
ACLOCAL_SOURCES = \
build/aclocal/bakefile.m4 \
build/aclocal/bakefile-lang.m4 \
build/aclocal/cppunit.m4 \
build/aclocal/gst-element-check.m4 \
build/aclocal/gtk-2.0.m4 \
build/aclocal/gtk.m4 \
build/aclocal/pkg.m4 \
build/aclocal/sdl.m4
# Run aclocal whenever acinclude or one of our local m4s is updated.
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
$(ACLOCAL) -I build/aclocal

View File

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

View File

@@ -1,267 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<bakefile-gen>
<!--
Formats listed here are not generated by default. To enable them, either
remove them from the <disable-formats> directive below or create
Bakefiles.local.bkgen file in this directory and add <enable-formats>
into it:
<?xml version="1.0" ?>
<bakefile-gen>
<enable-formats>dmars</enable-formats>
</bakefile-gen>
Reasons why these formats are disabled (and so not in CVS):
cbuilderx - Generated projects are too bad to be included in CVS. Please
*do not* enable this format until FIXMEs in .bkl files related
to cbuilderx are addressed. In particular, the project must
be placed into build/msw(?) directory and store object files
in its subdirectory and it must copy setup.h as others do.
cbx_unix - Doesn't integrate well and won't be used by most Unix people.
dmars, dmars_smake, msevc4prj - These are generated at release time and
we don't want to clutter the source tree with these files.
-->
<disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
<input>
wx.bkl
../../contrib/build/*/*.bkl
../../samples/*.bkl
../../samples/*/*.bkl
../../samples/*/*/*.bkl
../../demos/*.bkl
../../demos/*/*.bkl
../../demos/*/*/*.bkl
../../utils/*.bkl
../../utils/*/*.bkl
../../utils/*/*/*.bkl
../../contrib/samples/*.bkl
../../contrib/samples/*/*.bkl
../../contrib/samples/*/*/*.bkl
../../contrib/utils/*/*.bkl
../../tests/*.bkl
</input>
<!-- List of output formats to generate: -->
<add-formats>
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
</add-formats>
<del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../demos/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/mobile/mobile_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../utils/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<!-- WinCE can't have console apps: -->
<del-formats files="../../samples/console/*">msevc4prj</del-formats>
<del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
<del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../tests/*">msevc4prj</del-formats>
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,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_smake">
-o../msw/makefile.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-o../msw/makefile.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-o../msw/makefile.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-o../msw/makefile.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-o../msw/makefile.wat
</add-flags>
<add-flags files="wx.bkl" formats="msvc6prj">
-o../msw/wx.dsw
</add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>
<add-flags files="wx.bkl" formats="cbuilderx">
-o../../wx.cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
</add-flags>
<!-- FIXME: don't do this once it is possible (new CBX version) -->
<add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl"
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
</add-flags>
<!-- Format specific settings: -->
<add-flags formats="autoconf">
-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
</add-flags>
<add-formats files="wx.bkl">rpmspec</add-formats>
<!-- Makefile specific settings: -->
<add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
-DWRITE_OPTIONS_FILE=0
</add-flags>
<del-flags files="wx.bkl">
-DWRITE_OPTIONS_FILE=0
</del-flags>
<add-flags files="wx.bkl" formats="borland">
-DOPTIONS_FILE=config.bcc
</add-flags>
<add-flags files="wx.bkl" formats="dmars_smake">
-DOPTIONS_FILE=config.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-DOPTIONS_FILE=config.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-DOPTIONS_FILE=config.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-DOPTIONS_FILE=config.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-DOPTIONS_FILE=config.wat
</add-flags>
<add-flags files="../../*/*">-DWXTOPDIR=../</add-flags>
<add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
<add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
<add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
<add-flags files="../../*/*" formats="borland">
-DOPTIONS_FILE=../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*" formats="dmars_smake">
-DOPTIONS_FILE=../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*" formats="dmars">
-DOPTIONS_FILE=../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*" formats="mingw">
-DOPTIONS_FILE=../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*" formats="msvc">
-DOPTIONS_FILE=../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*" formats="watcom">
-DOPTIONS_FILE=../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*" formats="borland">
-DOPTIONS_FILE=../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*" formats="dmars">
-DOPTIONS_FILE=../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*" formats="mingw">
-DOPTIONS_FILE=../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*" formats="msvc">
-DOPTIONS_FILE=../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*" formats="watcom">
-DOPTIONS_FILE=../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../../build/msw/config.wat
</add-flags>
<!-- Makefiles for out-of-tree building of samples on Unix: -->
<add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
gnu
</add-formats>
<add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
formats="gnu">
-DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
</add-flags>
<!-- Personal customizations (not in CVS): -->
<include file="Bakefiles.local.bkgen" ignore_missing="1"/>
</bakefile-gen>

View File

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

View File

@@ -1,59 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Generate build.cfg file on Windows, with settings used to build
the library.
-->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<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_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
@echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
</command>
</action>
</if>
</makefile>

View File

@@ -1,770 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<requires version="0.2.1"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<!-- load python module with wxwindows helpers: -->
<using module="wxwin"/>
<!-- DFE: Add a platform meaning regular MacOS (not OS X) -->
<!-- FIXME: This will be handled in Bakefile but for now I wanted to
get my changes to the wx bakefiles in the tree but invisible to
windows toolkits and their config.xxx settings -->
<if cond="FORMAT=='autoconf'">
<option name="PLATFORM_MACOS"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="PLATFORM_MACOS">0</set>
</if>
<!-- FIXME: PalmOS is another candidate to bakefiles -->
<set var="PLATFORM_PALMOS">0</set>
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<!-- wxWidgets version numbers logic: -->
<include file="version.bkl"/>
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
<!-- ================================================================== -->
<set var="PORTNAME">
<if cond="USE_GUI=='0'">base</if>
<if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
</set>
<set var="WXBASEPORT">
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
<set var="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
<if cond="not isdefined('COMPILER')">gcc</if>
</set>
<set var="WXCOMPILER">
<if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
</set>
<set var="VENDORTAG">
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
</set>
<set var="WXDEBUGFLAG">
<if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
<if cond="DEBUG_FLAG=='1'">d</if>
</set>
<set var="WXUNICODEFLAG">
<!-- WinCE is Unicode-only platform: -->
<if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
</set>
<set var="WXNAMESUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
</set>
<set var="WXUNIVNAME">
<if cond="WXUNIV=='1'">univ</if>
</set>
<set var="WXUNIV_DEFINE">
<if cond="WXUNIV=='1'">__WXUNIVERSAL__</if>
</set>
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
</set>
<set var="WXNAMEPREFIXGUI">
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
<if cond="PLATFORM_WIN32=='1'">
wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
</set>
<set var="WXDLLNAMEPREFIXGUI">
<if cond="PLATFORM_WIN32=='1'">
wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
</set>
<set var="WXDLLVERSIONTAG">
<if cond="PLATFORM_WIN32=='1'"></if>
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
<set var="WXLIB_QA">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</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_MEDIA">
<if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</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_XRC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</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_AUI">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
</set>
<set var="WXLIB_RICHTEXT">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
<!-- =============================================================== -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="TARGET_CPU=='amd64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
<if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">
<if cond="FORMAT!='cbuilderx'">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
<set var="LIBTYPE_SUFFIX" make_var="1">
<if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
<if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
<if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
<if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
</set>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="SETUPHDIR" make_var="1">
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
</if>
<!-- =============================================================== -->
<!-- Templates for libs: -->
<!-- =============================================================== -->
<set var="DEBUGINFO">
<if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
<if cond="DEBUG_INFO=='1'">on</if>
<if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
<if cond="DEBUG_INFO=='0'">off</if>
</set>
<set var="DEBUGRUNTIME">
<if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
<if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</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="RTTIFLAG">
<if cond="USE_RTTI=='1'">on</if>
<if cond="USE_RTTI=='0'">off</if>
</set>
<set var="THREADSFLAG">
<if cond="USE_THREADS=='1'">multi</if>
<if cond="USE_THREADS=='0'">single</if>
</set>
<set var="RTTI_DEFINE">
<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
</set>
<set var="EXCEPTIONS_DEFINE">
<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
</set>
<set var="THREAD_DEFINE">
<if cond="USE_THREADS=='0'">wxNO_THREADS</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="MSLU_DEFINE">
<if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
</set>
<!-- fill for the specific case of the format/compiler -->
<set var="WIN32_WINNT">
<if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
</set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="GDIPLUS_LIB">
<if cond="USE_GDIPLUS=='1'">gdiplus</if>
</set>
<set var="GFXCTX_DEFINE">
<if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
</set>
</if>
<set var="LINK_TARGET_CPU">
<if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
<template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>$(THREADSFLAG)</threading>
<runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
<cxx-rtti>$(RTTIFLAG)</cxx-rtti>
<cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<define>$(NO_VC_CRTDBG)</define>
<define>$(WIN32_WINNT)</define>
<if cond="FORMAT=='msevc4prj' and
BAKEFILE_VERSION in ['0.1.9'] and
USE_RTTI=='0'">
<!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
<set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
<set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
</if>
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
</if>
<include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>
</template>
<template id="anylib">
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
<if cond="FORMAT=='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
</if>
<if cond="FORMAT!='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
</if>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWidgets; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
</template>
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<msvc-project-files>
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</define-tag>
<set var="msvc_copy_setup_h_script">
<if cond="IS_MSVC_PRJ">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\%s
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</if>
</set>
<define-tag name="msvc-headers-setup-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<msvc-headers>
$(addPrefixToList('wx/', value))
</msvc-headers>
<set var="_custom_build_files" append="1">
$(nativePaths(addPrefixToList('include/wx/', value)))
</set>
</if>
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<if cond="FORMAT=='msevc4prj'">
<msvc-headers-setup-h>
msw/wince/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_wince_setup_h">
$(msvc_copy_setup_h_script % 'msw\wince\setup.h')
</set>
</if>
<if cond="FORMAT!='msevc4prj'">
<msvc-headers-setup-h>
msw/setup.h
univ/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_setup_h">
<if cond="WXUNIV=='0'">
$(msvc_copy_setup_h_script % 'msw\setup.h')
</if>
</set>
<set var="_custom_build_include_wx_univ_setup_h">
<if cond="WXUNIV=='1'">
$(msvc_copy_setup_h_script % 'univ\setup.h')
</if>
</set>
</if>
</if>
</define-tag>
<define-tag name="msvc-create-rcdefs-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<msvc-headers-setup-h>
msw/genrcdefs.h
</msvc-headers-setup-h>
<!-- FIXME: we need another way to get the compiler name -->
<set var="VC_COMPILER">
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
<if cond="FORMAT!='msevc4prj'">cl</if>
</set>
<set var="_custom_build_include_wx_msw_genrcdefs_h">
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set>
</if>
</define-tag>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
<msvc-create-rcdefs-h/>
</template>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
<!-- =============================================================== -->
<!-- 3rd party libraries: -->
<include file="regex.bkl"/>
<include file="zlib.bkl"/>
<include file="png.bkl"/>
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWidgets libs: -->
<!-- =============================================================== -->
<!-- NB: in monolithic build, even wxBase-only must be linked against
GUI extralibs, otherwise there would be unresolved references.
The variables below are defined so that all libs are used
in monolithic build, but not in multilib one. -->
<set var="EXTRALIBS_FOR_BASE">
<if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
</set>
<set var="EXTRALIBS_FOR_GUI">
<if cond="MONOLITHIC=='1'"></if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
<set var="MGLPMLIBPATH">
<if cond="DOS32=='DOS4GW'">dos4gw</if>
</set>
</if>
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>$(EXCEPTIONS_DEFINE)</define>
<define>$(RTTI_DEFINE)</define>
<define>$(THREAD_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<define>$(MSLU_DEFINE)</define>
<if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<lib-path>$(MGLLIBPATH)</lib-path>
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
</if>
<warnings>max</warnings>
<cppflags-watcom>
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
-wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
-wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
</cppflags-watcom>
<cxxflags-mingw>
-Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
</cxxflags-mingw>
</template>
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
<!-- system libraries on os2: -->
<if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
<if cond="FORMAT=='watcom'">
<sys-lib>upm32</sys-lib>
</if>
</if>
<!-- system libraries on mgl: -->
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<sys-lib>mgl</sys-lib>
<sys-lib>mglcpp</sys-lib>
<sys-lib>pm</sys-lib>
</if>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="FORMAT=='msevc4prj'">
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>commctrl</sys-lib>
<sys-lib>winsock</sys-lib>
<sys-lib>wininet</sys-lib>
</if>
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>comdlg32</sys-lib>
<sys-lib>winspool</sys-lib>
<sys-lib>winmm</sys-lib>
<sys-lib>shell32</sys-lib>
<sys-lib>comctl32</sys-lib>
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
<if cond="FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
<sys-lib>odbc32</sys-lib>
</if>
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template_append="wx_append_base_nomono">
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/common/dummy.cpp
</precomp-headers-gen>
</if>
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
<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/extended.c
</precomp-headers-exclude>
</if>
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
<msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
<msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
<msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
<msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
<msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
<msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
<msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
<msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
<msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
<msvc-file-group>Common Headers:*wx/*.h</msvc-file-group>
</if>
</template>
<if cond="FORMAT=='autoconf'">
<set var="RCDEFDIR">
<if cond="TOOLKIT=='MSW'">
$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
</if>
</set>
</if>
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
<!-- FIXME: until libtool scheme is implemented in bakefile -->
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
<!-- version info resources: -->
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
<if cond="FORMAT=='autoconf'">
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
</if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</template>
<template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
</template>
<template id="wx_3rdparty_dependencies"
template="wx_3rdparty_dependencies_gui">
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<include>$(DOLLAR)(%SCITECH)/include</include>
</if>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
</template>
<template id="wx_3rdparty_includes"
template="wx_3rdparty_includes_gui">
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>
<include>$(INC_EXPAT)</include>
</template>
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_nomono"/>
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>
<!-- =============================================================== -->
<!-- Templates for building wxWidgets plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
</set>
</if>
<set var="PLUGVERDELIM">
<if cond="PLATFORM_UNIX=='1'">-</if>
<if cond="PLATFORM_UNIX=='0'"></if>
</set>
<set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
<if cond="UNICODE=='0' and BUILD=='debug'">d</if>
<if cond="UNICODE=='1' and BUILD=='release'">u</if>
<if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
</set>
<set var="PLUGINS_INST_DIR" make_var="1">
$(LIBDIR)/wx/$(PLUGIN_VERSION0)
</set>
<define-rule name="wx-base-plugin" extends="module">
<template>
<dllname>
$(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
$(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWidgets samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
<!-- A hack to keep autoconf happy (we pass CPPFLAGS that contain
{top_srcdir} from configure, poor bakefile can't know that
and won't output top_srcdir = @top_srcdir@ line): -->
<set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
</makefile>

View File

@@ -1,50 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="not isdefined('file_common_samples_included')">
<include file="common.bkl"/>
</if>
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
<!-- =============================================================== -->
<template id="wx_contrib_lib" template="wx_lib_b">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<if cond="isdefined('file_common_samples_included')">
<template id="wx_contrib_sample" template="wx_sample">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_util" template="wx_util">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
</if>
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
</template>
<!-- Link against one contrib library. Value must be literal! -->
<define-tag name="contrib-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>
$(wxwin.makeContribDspDependency(value))
</depends-on-dsp>
</if>
</define-tag>
</makefile>

View File

@@ -1,19 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="file_common_samples_included">1</set>
<if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
<set var="OUT_OF_TREE_MAKEFILES">0</set>
</if>
<if cond="OUT_OF_TREE_MAKEFILES=='1'">
<include file="common_samples_outoftree.bkl"/>
</if>
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<include file="common_samples_intree.bkl"/>
</if>
</makefile>

View File

@@ -1,121 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<!-- =============================================================== -->
<!-- Template for wxWidgets samples: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<set var="MACOSX_RESOURCES">
<if cond="TOOLKIT=='MAC'">
Carbon.r sample.r
</if>
</set>
</if>
<set var="DLLFLAG">
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_util_b" template="wx">
<include>$(SRCDIR)</include>
<define>$(DLLFLAG)</define>
</template>
<template id="wx_util" template="wx_util_b">
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
<!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
<!-- this include is not added via <include> for autoconf, see
common.bkl: -->
<if cond="FORMAT=='autoconf'">
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
</if>
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
<if cond="FORMAT=='autoconf'">
<wx-os2-lib-resource/>
</if>
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
<if cond="FORMAT!='autoconf'">
<define>NOPCH</define>
</if>
</template>
<template id="wx_util_console" template="wx_util_b">
<app-type>console</app-type>
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_sample" template="wx_util">
<if cond="FORMAT=='autoconf'">
<wx-mac-app-bundle/>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
</if>
</template>
<template id="wx_sample_console" template="wx_util_console">
<if cond="FORMAT=='autoconf'">
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
</if>
</template>
<!-- =============================================================== -->
<!-- Support for samples data files: -->
<!-- =============================================================== -->
<define-rule name="wx-data" extends="copy-files">
<template>
<dependency-of>all</dependency-of>
<dstdir>$(BUILDDIR)</dstdir>
<srcdir>$(SRCDIR)</srcdir>
</template>
<!--
VS - FIXME:
Don't clean the files because it would wipe out sources files if
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
but it would be better to delete the files during "make clean" if
BUILDDIR!=SRCDIR.
<define-tag name="files">
<clean-files>
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
</clean-files>
</define-tag>
-->
</define-rule>
<!-- =============================================================== -->
<!-- Misc platform specialities: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<include file="mac_bundles.bkl"/>
<!--
A hack to include precompiled OS/2 resource file in apps instead of
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
compiler):
-->
<define-tag name="wx-os2-lib-resource" rules="exe">
<set var="os2_lib_res">
<if cond="PLATFORM_OS2=='1'">
$(TOP_SRCDIR)include/wx/os2/wx.res
</if>
</set>
<set var="__objects" append="1">$(os2_lib_res)</set>
</define-tag>
</if>
</makefile>

View File

@@ -1,43 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- =============================================================== -->
<!-- Templates for out-of-tree Unix makefiles for wxWidgets samples: -->
<!-- =============================================================== -->
<include file="wxpresets/presets/wx.bkl"/>
<template id="wx_app_base" template="wx">
<include>$(SRCDIR)</include>
</template>
<template id="wx_util" template="wx_app_base">
<app-type>gui</app-type>
</template>
<template id="wx_util_console" template="wx_app_base">
<app-type>console</app-type>
</template>
<template id="wx_sample" template="wx_util"/>
<template id="wx_sample_console" template="wx_util_console"/>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx_app_base"/>
</define-rule>
<!-- empty stubs for things that don't make sense for makefile.unx: -->
<template id="wx_append"/>
<template id="wx_append_base"/>
<define-rule name="wx-data" pseudo="1">
<define-tag name="files"/>
<define-tag name="dstdir"/>
<define-tag name="srcdir"/>
</define-rule>
</makefile>

View File

@@ -1,507 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="BUILDING_LIB" overwrite="0">0</set>
<set var="CPP_DEFAULT_VALUE">
<if cond="FORMAT=='borland'">
cpp32 -Sr -oCON
</if>
<if cond="FORMAT=='mingw'">
$(DOLLAR)(CC) -E
</if>
<if cond="FORMAT=='msvc'">
$(DOLLAR)(CC) /EP /nologo
</if>
<if cond="FORMAT=='watcom'">
$(DOLLAR)(CC) -p
</if>
</set>
<option name="CPP">
<default-value>
$(CPP_DEFAULT_VALUE)
</default-value>
<description>
The C preprocessor
</description>
</option>
<option name="SHARED">
<values>0,1</values>
<values-description>,DLL</values-description>
<default-value>0</default-value>
<description>
What type of library to build?
</description>
</option>
<option name="WXUNIV">
<values>0,1</values>
<values-description>,Universal</values-description>
<default-value>0</default-value>
<description>
Build wxUniversal instead of native port?
</description>
</option>
<option name="UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWidgets?
</description>
</option>
<if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
<option name="MSLU">
<values>0,1</values>
<default-value>0</default-value>
<description>
Use MSLU library when building Unicode version.
</description>
</option>
</if>
<if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
<set var="MSLU">0</set>
</if>
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
<default-value>debug</default-value>
<description>
Type of compiled binaries
</description>
</option>
<if cond="FORMAT=='msvc'">
<option name="TARGET_CPU">
<default-value>$(DOLLAR)(CPU)</default-value>
<description>
The target processor architecture must be specified when it is not X86.
This does not affect the compiler output, so you still need to make sure
your environment is set up appropriately with the correct compiler in the
PATH. Rather it affects some options passed to some of the common build
utilities such as the resource compiler and the linker.
Accepted values: AMD64, IA64.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="TARGET_CPU"/>
</if>
<!-- FIXME: restore this once bakefile is fixed to not use
/Gm /GZ (incompatible with /O2) w/ debug-info -->
<set var="DEBUG_INFO_DEFAULT">
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
</set>
-->
<set var="DEBUG_INFO_DEFAULT">default</set>
<option name="DEBUG_INFO">
<values>0,1,default</values>
<default-value>$(DEBUG_INFO_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 BUILD 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_MEDIA">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build multimedia library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_XRC">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxXRC library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_AUI">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxAUI library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_RICHTEXT">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxRichTextCtrl 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>
<!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
<set var="USE_QA_DEFAULT">
<if cond="FORMAT in ['msvc','msvc6prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
</set>
<option name="USE_QA">
<values>0,1</values>
<default-value>$(USE_QA_DEFAULT)</default-value>
<description>
Build quality assurance classes library (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="USE_RTTI">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable run-time type information (RTTI) in compiled code.
</description>
</option>
<option name="USE_THREADS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable threading in compiled code.
</description>
</option>
<if cond="FORMAT!='autoconf'">
<option name="USE_GDIPLUS">
<values>0,1</values>
<default-value>0</default-value>
<description>
Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
</description>
</option>
</if>
<option name="OFFICIAL_BUILD">
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWidgets developers?
</description>
</option>
<option name="VENDOR">
<default-value>custom</default-value>
<description>
Use this to name your customized DLLs differently
</description>
</option>
<!-- These basically do what vendor does in the places it didn't. -->
<!-- They should all be unified under some suitable descriptor -->
<option name="WX_FLAVOUR">
<default-value></default-value>
</option>
<option name="WX_LIB_FLAVOUR">
<default-value></default-value>
</option>
<option name="CFG">
<default-value></default-value>
<description>
Name of your custom configuration. This affects directory
where object files are stored as well as the location of
compiled .lib files and setup.h under the lib/ toplevel directory.
</description>
</option>
<!-- unit tests support: -->
<option name="CPPUNIT_CFLAGS">
<default-value></default-value>
<description>
Compiler flags needed to compile test suite in tests directory. If you want
to run the tests, set it so that the compiler can find CppUnit headers.
</description>
</option>
<option name="CPPUNIT_LIBS">
<default-value></default-value>
<description>
Linker flags needed to link test suite in tests directory. If you want
to run the tests, include CppUnit library here.
</description>
</option>
<!-- ================================================================== -->
<!-- Autoconf -->
<!-- ================================================================== -->
<if cond="FORMAT=='autoconf'">
<option name="DEREZ"/>
<option name="TOOLKIT"/>
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>
<option name="TOOLCHAIN_NAME"/>
<option name="TOOLCHAIN_FULLNAME"/>
<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="EXTRALIBS_GNOMEPRINT"/>
<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>
<option name="wx_top_builddir"/>
</if>
<!-- ================================================================== -->
<!-- windows/dos/os2 compilers -->
<!-- ================================================================== -->
<if cond="FORMAT!='autoconf'">
<option name="RUNTIME_LIBS">
<values>dynamic,static</values>
<default-value>dynamic</default-value>
<description>
Version of C runtime library to use. You can change this to
static if SHARED=0, but it is highly recommended to not do
it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0">
<if cond="FORMAT=='msevc4prj'">WINCE</if>
<if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
<if cond="PLATFORM_MSDOS=='1'">MGL</if>
<if cond="PLATFORM_OS2=='1'">PM</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
<set var="EXTRALIBS_GNOMEPRINT"/>
<set var="WITH_PLUGIN_SDL">0</set>
<set var="SRCDIR">
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
</if>
<if cond="FORMAT=='mingw'">
<option name="GCC_VERSION">
<values>3,2.95</values>
<default-value>3</default-value>
<description>
Set the version of your Mingw installation here.
"3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
"2.95" ... for Mingw 1.1 or any of the older versions
</description>
</option>
<set var="GCCFLAGS">
<if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
</set>
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
</if>
<if cond="FORMAT=='cbuilderx'">
<set var="EXTRACFLAGS">
<if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
</set>
</if>
<!-- ================================================================== -->
<!-- Project files - hardcode some defaults -->
<!-- ================================================================== -->
<if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
<set var="RUNTIME_LIBS">dynamic</set>
<set var="OFFICIAL_BUILD">0</set>
<set var="USE_AUI">1</set>
<set var="USE_RICHTEXT">1</set>
<set var="USE_HTML">1</set>
<set var="USE_MEDIA">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>
<set var="USE_ODBC">1</set>
<set var="USE_QA">1</set>
<set var="MONOLITHIC">0</set>
<set var="USE_GUI">1</set>
<set var="USE_EXCEPTIONS">1</set>
<set var="USE_RTTI">1</set>
<set var="USE_THREADS">1</set>
<if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
<set var="DEBUG_INFO">$(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>
<!-- Free version does not distribute OpenGL,
in commercial distribution better use dmars_smake format -->
<set var="USE_OPENGL">0</set>
</if>
<!-- No need for wxUniv on embedded devices (yet): -->
<if cond="FORMAT=='msevc4prj'">
<set var="WXUNIV">0</set>
<set var="UNICODE">1</set>
<!-- Uploading debug reports from PDAs seems impractical -->
<set var="USE_QA">0</set>
<set var="MONOLITHIC">1</set> <!-- sic! -->
<!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
<set var="USE_RTTI">0</set>
<set var="USE_EXCEPTIONS">0</set>
</if>
<!-- Need for wxUniv within wxMGL: -->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
<set var="WXUNIV">1</set>
<set var="USE_THREADS">0</set>
<set var="RUNTIME_LIBS">static</set>
</if>
</makefile>

View File

@@ -1,48 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_EXPAT"/>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_EXPAT">builtin</set>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<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>
<define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
OS2_32
</define>
<define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
__MSDOS__
</define>
<cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
<sources>
src/expat/lib/xmlparse.c
src/expat/lib/xmlrole.c
src/expat/lib/xmltok.c
</sources>
</lib>
</makefile>

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,846 +0,0 @@
#
# "make dist" target implementation:
#
############################# Dirs #################################
WXDIR = $(top_srcdir)
# Subordinate library possibilities
SRCDIR = $(WXDIR)/src
GENDIR = $(WXDIR)/src/generic
COMMDIR = $(WXDIR)/src/common
HTMLDIR = $(WXDIR)/src/html
RICHTEXTDIR = $(WXDIR)/src/richtext
AUIDIR = $(WXDIR)/src/aui
UNIXDIR = $(WXDIR)/src/unix
PNGDIR = $(WXDIR)/src/png
JPEGDIR = $(WXDIR)/src/jpeg
TIFFDIR = $(WXDIR)/src/tiff
ZLIBDIR = $(WXDIR)/src/zlib
REGEXDIR = $(WXDIR)/src/regex
EXPATDIR = $(WXDIR)/src/expat
GTKDIR = $(WXDIR)/src/gtk
GTK1DIR = $(WXDIR)/src/gtk1
X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
MGLDIR = $(WXDIR)/src/mgl
MOTIFDIR = $(WXDIR)/src/motif
MSDOSDIR = $(WXDIR)/src/msdos
MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
MACDIR = $(WXDIR)/src/mac
COCOADIR = $(WXDIR)/src/cocoa
ODBCDIR = $(WXDIR)/src/iodbc
FTDIR = $(WXDIR)/src/freetype
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
DEMODIR = $(WXDIR)/demos
UTILSDIR = $(WXDIR)/utils
MISCDIR = $(WXDIR)/misc
DOCDIR = $(WXDIR)/docs
INTLDIR = $(WXDIR)/locale
TOOLKITDIR = $(TOOLKIT_LOWERCASE)
########################## Archive name ###############################
# append a version suffix x.y.z to all file names
WXARCHIVE=@DISTDIR@-$(WX_VERSION).tar.gz
WXGLARCHIVE=@DISTDIR@-gl-$(WX_VERSION).tar.gz
WXSAMPLES=wx$(TOOLKIT)-samples-$(WX_VERSION).tar.gz
WXDEMOS=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.gz
WXARCHIVE_ZIP=wxMSW-$(WX_VERSION).zip
WXARCHIVE_BZIP=@DISTDIR@-$(WX_VERSION).tar.bz2
WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(WX_VERSION).tar.bz2
WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(WX_VERSION).tar.bz2
WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
DISTDIR=./_dist_dir/$(DISTDIRNAME)
BASEDISTDIR=./_dist_dir/wxBase-$(WX_VERSION)
########################## Tools ###############################
CP_PR = cp -pR
CP_P = cp -p
########################## make dist rules ###############################
# this target should copy only the files common to really all ports (including
# wxBase) to the dist dir
ALL_DIST: distrib_clean
mkdir _dist_dir
mkdir $(DISTDIR)
$(CP_P) $(WXDIR)/configure.in $(DISTDIR)
$(CP_P) $(WXDIR)/configure $(DISTDIR)
$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/config.sub $(DISTDIR)
$(CP_P) $(WXDIR)/config.guess $(DISTDIR)
$(CP_P) $(WXDIR)/install-sh $(DISTDIR)
$(CP_P) $(WXDIR)/mkinstalldirs $(DISTDIR)
$(CP_P) $(WXDIR)/wx-config.in $(DISTDIR)
$(CP_P) $(WXDIR)/wx-config-inplace.in $(DISTDIR)
$(CP_P) $(WXDIR)/version-script.in $(DISTDIR)
$(CP_P) $(WXDIR)/setup.h.in $(DISTDIR)
$(CP_P) $(WXDIR)/setup.h_vms $(DISTDIR)
$(CP_P) $(WXDIR)/descrip.mms $(DISTDIR)
$(CP_P) $(WXDIR)/Makefile.in $(DISTDIR)
$(CP_P) $(WXDIR)/wxBase.spec $(DISTDIR)
$(CP_P) $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
$(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
$(CP_P) $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
mkdir $(DISTDIR)/lib
$(CP_P) $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
$(CP_P) $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
mkdir $(DISTDIR)/src
# temp hack for common/execcmn.cpp: it's not supported by tmake
# yet (it's a header-like file but in src/common directory and it
# shouldn't be distributed...)
mkdir $(DISTDIR)/src/common
$(CP_P) $(SRCDIR)/common/execcmn.cpp $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/xml
$(CP_P) $(SRCDIR)/xml/*.cpp $(DISTDIR)/src/xml
mkdir $(DISTDIR)/src/zlib
$(CP_P) $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
$(CP_P) $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
$(CP_P) $(ZLIBDIR)/README $(DISTDIR)/src/zlib
#$(CP_P) $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
mkdir $(DISTDIR)/src/regex
$(CP_P) $(REGEXDIR)/*.h $(DISTDIR)/src/regex
$(CP_P) $(REGEXDIR)/*.c $(DISTDIR)/src/regex
$(CP_P) $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
$(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex
$(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat
#(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
mkdir $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/README $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
$(CP_P) $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
# copy some files from include/ that are not installed:
mkdir $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx
mkdir $(DISTDIR)/include/wx/private
$(CP_P) $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
$(CP_P) $(INCDIR)/wx/private/*.h $(DISTDIR)/include/wx/private
# copy wxpresets
mkdir $(DISTDIR)/build
mkdir $(DISTDIR)/build/bakefiles
mkdir $(DISTDIR)/build/bakefiles/wxpresets
mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
mkdir $(DISTDIR)/build/aclocal
$(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
# this target is the common part of distribution script for all GUI toolkits,
# but is not used when building wxBase distribution
ALL_GUI_DIST: ALL_DIST
$(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
if test -d $(INCDIR)/wx/$(TOOLKITDIR)/private; then \
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)/private && \
$(CP_P) $(INCDIR)/wx/$(TOOLKITDIR)/private/*.h $(DISTDIR)/include/wx/$(TOOLKITDIR)/private; \
fi
mkdir $(DISTDIR)/include/wx/generic
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/xml
mkdir $(DISTDIR)/include/wx/xrc
-$(CP_P) $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
$(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/art
mkdir $(DISTDIR)/art/gtk
mkdir $(DISTDIR)/art/motif
$(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
$(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
$(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
mkdir $(DISTDIR)/src/generic
mkdir $(DISTDIR)/src/html
mkdir $(DISTDIR)/src/richtext
mkdir $(DISTDIR)/src/aui
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
mkdir $(DISTDIR)/src/png
mkdir $(DISTDIR)/src/jpeg
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/unix
mkdir $(DISTDIR)/src/xrc
$(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
-$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
$(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
$(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
$(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
$(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
$(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
$(CP_P) $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
$(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
$(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff
BASE_DIST: ALL_DIST INTL_DIST
# make --disable-gui the default
rm $(DISTDIR)/configure.in
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
$(WXDIR)/configure.in > $(DISTDIR)/configure.in
rm $(DISTDIR)/configure
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
$(WXDIR)/configure > $(DISTDIR)/configure
chmod +x $(DISTDIR)/configure
mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/include/wx/xml
mkdir $(DISTDIR)/include/wx/msdos
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
mkdir $(DISTDIR)/include/wx/mac
mkdir $(DISTDIR)/include/wx/mac/carbon
mkdir $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/include/wx/os2
mkdir $(DISTDIR)/include/wx/palmos
mkdir $(DISTDIR)/src/unix
mkdir $(DISTDIR)/src/mac
mkdir $(DISTDIR)/src/mac/corefoundation
mkdir $(DISTDIR)/src/mac/carbon
mkdir $(DISTDIR)/src/mac/carbon/morefilex
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/os2
mkdir $(DISTDIR)/src/palmos
$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
$(CP_P) $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
$(CP_P) $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
done
list='$(ALL_BASE_SOURCES)'; for p in $$list; do \
$(CP_P) $(WXDIR)/$$p $(DISTDIR)/$$p; \
done
mkdir $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
mkdir $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
mkdir $(DISTDIR)/utils
mkdir $(DISTDIR)/utils/HelpGen
mkdir $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
$(CP_P) $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
mkdir $(DISTDIR)/utils/tex2rtf
mkdir $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
mv $(DISTDIR) $(BASEDISTDIR)
GTK_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
$(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk
$(CP_P) $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
$(CP_P) $(GTKDIR)/*.c $(DISTDIR)/src/gtk
$(CP_P) $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
$(CP_P) $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
mkdir $(DISTDIR)/include/wx/gtk1
$(CP_P) $(INCDIR)/wx/gtk1/*.h $(DISTDIR)/include/wx/gtk1
mkdir $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.h $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.cpp $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1
mkdir $(DISTDIR)/include/wx/gtk/gnome
mkdir $(DISTDIR)/src/gtk/gnome
$(CP_P) $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome
$(CP_P) $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome
mkdir $(DISTDIR)/src/mac
mkdir $(DISTDIR)/src/mac/corefoundation
$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
mkdir $(DISTDIR)/include/wx/mac
mkdir $(DISTDIR)/include/wx/mac/corefoundation
$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
X11_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
$(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
$(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
mkdir $(DISTDIR)/src/mac
mkdir $(DISTDIR)/src/mac/corefoundation
$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
mkdir $(DISTDIR)/include/wx/mac
mkdir $(DISTDIR)/include/wx/mac/corefoundation
$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
MOTIF_DIST: ALL_GUI_DIST
$(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
$(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
$(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
mkdir $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
mkdir $(DISTDIR)/src/x11
mkdir $(DISTDIR)/include/wx/x11
$(CP_P) $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
$(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
$(DISTDIR)/src/x11
$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
$(DISTDIR)/include/wx/x11
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
MACX_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx/mac/carbon
mkdir $(DISTDIR)/include/wx/mac/private
mkdir $(DISTDIR)/include/wx/mac/carbon/private
$(CP_P) $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
$(CP_P) $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
$(CP_P) $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
$(CP_P) $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
mkdir $(DISTDIR)/include/wx/mac/corefoundation
$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/src/mac/corefoundation
$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
mkdir $(DISTDIR)/src/html/htmlctrl
mkdir $(DISTDIR)/src/html/htmlctrl/webkit
$(CP_P) $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
mkdir $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
mkdir $(DISTDIR)/src/mac/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile
mkdir $(DISTDIR)/src/mac/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
COCOA_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa
$(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
$(CP_P) $(COCOADIR)/*.cpp $(DISTDIR)/src/cocoa
$(CP_P) $(COCOADIR)/*.r $(DISTDIR)/src/cocoa
mkdir $(DISTDIR)/include/wx/mac/corefoundation
$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/src/mac/corefoundation
$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
mkdir $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
MSW_DIST: UNIV_DIST
mkdir $(DISTDIR)/include/wx/msw/ole
mkdir $(DISTDIR)/include/wx/msw/wince
$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
$(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
mkdir $(DISTDIR)/src/msw/ole
mkdir $(DISTDIR)/src/msw/wince
$(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
$(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/msw/ole
mkdir $(DISTDIR)/include/wx/msw/wince
$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
$(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/msw/ole
mkdir $(DISTDIR)/src/msw/wince
$(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
$(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
$(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src
$(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
UNIV_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/univ
mkdir $(DISTDIR)/src/univ
mkdir $(DISTDIR)/src/univ/themes
$(CP_P) $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
$(CP_P) $(INCDIR)/wx/univ/setup0.h $(DISTDIR)/include/wx/univ/setup.h
$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
MGL_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
mkdir $(DISTDIR)/include/wx/msdos
$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos
$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos
$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
mkdir $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/*.ico $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs
$(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
$(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
mkdir $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty
$(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty
mkdir $(DISTDIR)/demos/life
mkdir $(DISTDIR)/demos/life/bitmaps
$(CP_P) $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.rc $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/*.ico $(DISTDIR)/demos/life
$(CP_P) $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
$(CP_P) $(DEMODIR)/life/bitmaps/*.bmp $(DISTDIR)/demos/life/bitmaps
mkdir $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.rc $(DISTDIR)/demos/poem
$(CP_P) $(DEMODIR)/poem/*.ico $(DISTDIR)/demos/poem
mkdir $(DISTDIR)/demos/fractal
$(CP_P) $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
$(CP_P) $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
$(CP_P) $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
$(CP_P) $(DEMODIR)/fractal/*.rc $(DISTDIR)/demos/fractal
$(CP_P) $(DEMODIR)/fractal/*.ico $(DISTDIR)/demos/fractal
SAMPLES_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
# copy files common to all samples in a general way
for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
-mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(CP_P) $$s/Makefile.in \
`find $$s -maxdepth 1 -name 'makefile.*' -o -name descrip.mms -o \
-name '*.cpp' -o -name '*.h' -o \
-name '*.bmp' -o -name '*.ico' -o -name '*.png' -o \
-name '*.rc' -o -name '*.xpm'` $$t; \
i=""; \
if [ -d $$s/bitmaps ]; then i="bitmaps"; fi; \
if [ -d $$s/icons ]; then i="icons"; fi; \
if [ -n "$$i" ]; then \
mkdir $$t/$$i; \
cp `find $$s/$$i -name '*.bmp' -o -name '*.xpm'` $$t/$$i; \
fi; \
done
# copy the rest, not covered by the above loop
$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani
$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
$(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
mkdir $(DISTDIR)/samples/help/doc
$(CP_P) $(SAMPDIR)/help/*.h?? $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/*.gif $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/cshelp.txt $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/*.chm $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/*.cnt $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/doc.zip $(DISTDIR)/samples/help
$(CP_P) $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
mkdir $(DISTDIR)/samples/html/about/data
$(CP_P) $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
$(CP_P) $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
mkdir $(DISTDIR)/samples/html/help/helpfiles
$(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
$(CP_P) $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
$(CP_P) $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
$(CP_P) $(SAMPDIR)/html/printing/*.gif $(DISTDIR)/samples/html/printing
$(CP_P) $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test
$(CP_P) $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
$(CP_P) $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
$(CP_P) $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
$(CP_P) $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
$(CP_P) $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
$(CP_P) $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
$(CP_P) $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image
$(CP_P) $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
$(CP_P) $(SAMPDIR)/internat/readme.txt $(DISTDIR)/samples/internat
for f in `(cd $(SAMPDIR); find internat -name '*.[mp]o' -print)`; do \
mkdir -p $(DISTDIR)/samples/`dirname $$f`; \
$(CP_P) $(SAMPDIR)/$$f $(DISTDIR)/samples/$$f; \
done
$(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
$(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
$(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
$(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
$(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
$(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext
$(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext
$(CP_P) $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound
$(CP_P) $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash
mkdir $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc
UTILS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/utils
$(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
mkdir $(DISTDIR)/utils/tex2rtf
mkdir $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
$(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
-$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
mkdir $(DISTDIR)/utils/emulator
mkdir $(DISTDIR)/utils/emulator/src
mkdir $(DISTDIR)/utils/emulator/docs
$(CP_P) $(UTILSDIR)/emulator/*.in $(DISTDIR)/utils/emulator
$(CP_P) $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/src/*.xpm $(DISTDIR)/utils/emulator/src
$(CP_P) $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
$(CP_P) $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
mkdir $(DISTDIR)/utils/hhp2cached
$(CP_P) $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached
$(CP_P) $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
$(CP_P) $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
mkdir $(DISTDIR)/utils/HelpGen
mkdir $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
$(CP_P) $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
$(CP_P) $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
mkdir $(DISTDIR)/utils/helpview
mkdir $(DISTDIR)/utils/helpview/src
mkdir $(DISTDIR)/utils/helpview/src/bitmaps
$(CP_P) $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview
$(CP_P) $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/*.rc $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/*.ico $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/readme.txt $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
$(CP_P) $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
mkdir $(DISTDIR)/utils/wxrc
$(CP_P) $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc
$(CP_P) $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc
$(CP_P) $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
MISC_DIST: ALL_GUI_DIST
INTL_DIST:
mkdir $(DISTDIR)/locale
$(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
$(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
-$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
for dir in "$$subdirs"; do \
mkdir $(DISTDIR)/locale/$$dir; \
$(CP_P) $(INTLDIR)/$$dir/*.[pm]o $(DISTDIR)/locale/$$dir; \
done
MANUAL_DIST:
mkdir $(DISTDIR)/docs
mkdir $(DISTDIR)/docs/latex
mkdir $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
$(CP_P) $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
# Copy all the files from wxPython needed for the Debian source package,
# and then remove some that are not needed.
PYTHON_DIST:
for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
echo "Copying dir: $$dir..."; \
mkdir $(DISTDIR)/$$dir; \
$(CP_P) $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
done; \
\
find $(DISTDIR)/wxPython -name "*~" > RM_FILES; \
find $(DISTDIR)/wxPython -name "*.pyc" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "*.bat" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "core" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "*.orig" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "*.rej" >> RM_FILES; \
for f in `cat RM_FILES`; do rm $$f; done; \
rm RM_FILES
distrib_clean:
$(RM) -r _dist_dir
# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
# the files twice
dist-only:
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples-$(WX_VERSION); \
echo "*** Creating wxSamples archive..."; \
tar ch wxSamples-$(WX_VERSION) | gzip -f9 > ../../$(WXSAMPLES); \
mv wxSamples-$(WX_VERSION) samples; \
mv demos wxDemos-$(WX_VERSION); \
echo "*** Creating wxDemos archive..."; \
tar ch wxDemos-$(WX_VERSION) | gzip -f9 > ../../$(WXDEMOS); \
mv wxDemos-$(WX_VERSION) demos; \
fi
distdir: @GUIDIST@
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@# now prune away a lot of the crap included by using cp -R
@# in other dist targets.
find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf
dist: distdir
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples-$(WX_VERSION); \
echo "*** Creating wxSamples archive..."; \
tar ch wxSamples-$(WX_VERSION) | gzip -f9 > ../../$(WXSAMPLES); \
mv wxSamples-$(WX_VERSION) samples; \
mv demos wxDemos-$(WX_VERSION); \
echo "*** Creating wxDemos archive..."; \
tar ch wxDemos-$(WX_VERSION) | gzip -f9 > ../../$(WXDEMOS); \
mv wxDemos-$(WX_VERSION) demos; \
fi
bzip-dist-only:
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples-${WX_VERSION}; \
echo "*** Creating wxSamples archive..."; \
tar ch wxSamples-${WX_VERSION} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
mv wxSamples-${WX_VERSION} samples; \
mv demos wxDemos-${WX_VERSION}; \
echo "*** Creating wxDemos archive..."; \
tar ch wxDemos-${WX_VERSION} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
mv wxDemos-${WX_VERSION} demos; \
fi
bzip-dist: @GUIDIST@
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples; \
tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
mv wxSamples samples; \
mv demos wxDemos; \
tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
mv wxDemos demos; \
fi
# RR: Copy text and binary data separatly
win-dist: MSW_ZIP_TEXT_DIST
@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
@cd _dist_dir && zip -r -l ../$(WXARCHIVE_ZIP) *
$(CP_P) $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.ico _dist_dir/wxMSW/include/wx/msw
$(CP_P) $(INCDIR)/wx/msw/*.bmp _dist_dir/wxMSW/include/wx/msw
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.cur
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
mkdir $(DISTDIR)/debian
-$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
$(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
$(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
$(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
rm -f $(DISTDIR)/*.spec
@# now prune away a lot of the crap included by using cp -R
@# in other dist targets. Ugly and hardly portable but it
@# will run on any Debian box and that's enough for now.
rm -rf $(DISTDIR)/contrib/build
find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
-o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
-o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
-o -name "*.pro" \
-o -name "*.vpj" \
-o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
\) -print0 | xargs -0 rm -rf
rm -rf $(DISTDIR)/wxPython/SWIG
rm -rf $(DISTDIR)/wxPython/distrib
rm -rf $(DISTDIR)/wxPython/distutils
rm -rf $(DISTDIR)/wxPython/samples
rm -rf $(DISTDIR)/wxPython/contrib/iewin
find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
rm -rf $(DEBIAN_SOURCE_DIR)
mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
debian-msw-dirs:
mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/src/msw
RPMTOP=_dist_dir/_rpm_top
rpm: bzip-dist
@echo "*** Building RPMs ***"
-mkdir $(RPMTOP)
-mkdir $(RPMTOP)/SOURCES
-mkdir $(RPMTOP)/SPECS
-mkdir $(RPMTOP)/BUILD
-mkdir $(RPMTOP)/RPMS
-mkdir $(RPMTOP)/SRPMS
cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .

View File

@@ -1,42 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
$(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll>
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
<if cond="FORMAT=='watcom'">
<set var="LIB_PAGESIZE" overwrite="1">8192</set>
</if>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
</makefile>

View File

@@ -1,314 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
<dll id="basedll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</dll>
<lib id="baselib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
<!-- ================================================================= -->
<!-- wxNet library -->
<!-- ================================================================= -->
<dll id="netdll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_NET</define>
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="netlib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
<!-- ================================================================= -->
<!-- Main GUI library -->
<!-- ================================================================= -->
<dll id="coredll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="corelib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
<!-- ================================================================= -->
<!-- "Advanced" controls library -->
<!-- ================================================================= -->
<dll id="advdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ADV</define>
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
</dll>
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
<!-- wxMedia classes library -->
<!-- ================================================================= -->
<dll id="mediadll" template="wx_dll"
cond="SHARED=='1' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_MEDIA</define>
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="medialib" template="wx_lib"
cond="SHARED=='0' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
<!-- ================================================================= -->
<!-- DB classes library -->
<!-- ================================================================= -->
<dll id="odbcdll" template="wx_base_dll"
cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ODBC</define>
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
</dll>
<lib id="odbclib" template="wx_base_lib"
cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
</lib>
<dll id="dbgriddll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DBGRID</define>
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
<library>advdll</library>
<library>odbcdll</library>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="dbgridlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
<!-- ================================================================ -->
<!-- wxHTML -->
<!-- ================================================================ -->
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</dll>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
<!-- QA -->
<!-- ================================================================ -->
<dll id="qadll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_QA</define>
<sources>$(QA_SRC)</sources>
<msvc-headers>$(QA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<library>xmldll</library>
</dll>
<lib id="qalib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
<sources>$(QA_SRC)</sources>
<msvc-headers>$(QA_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
<!-- ================================================================ -->
<!-- XML -->
<!-- ================================================================ -->
<dll id="xmldll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XML</define>
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
</dll>
<lib id="xmllib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
<!-- ================================================================ -->
<!-- XRC -->
<!-- ================================================================ -->
<dll id="xrcdll" template="wx_dll"
cond="SHARED=='1' and USE_XRC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XRC</define>
<sources>$(XRC_SRC)</sources>
<library>htmldll</library>
<library>advdll</library>
<library>coredll</library>
<library>xmldll</library>
<library>basedll</library>
<msvc-headers>$(XRC_HDR)</msvc-headers>
</dll>
<lib id="xrclib" template="wx_lib"
cond="SHARED=='0' and USE_XRC=='1' and MONOLITHIC=='0'">
<sources>$(XRC_SRC)</sources>
<msvc-headers>$(XRC_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
<!-- ================================================================ -->
<!-- AUI -->
<!-- ================================================================ -->
<dll id="auidll" template="wx_dll"
cond="SHARED=='1' and USE_AUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_AUI</define>
<sources>$(AUI_SRC)</sources>
<library>advdll</library>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(AUI_HDR)</msvc-headers>
</dll>
<lib id="auilib" template="wx_lib"
cond="SHARED=='0' and USE_AUI=='1' and MONOLITHIC=='0'">
<sources>$(AUI_SRC)</sources>
<msvc-headers>$(AUI_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
<!-- ================================================================ -->
<!-- RICHTEXT -->
<!-- ================================================================ -->
<dll id="richtextdll" template="wx_dll"
cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_RICHTEXT</define>
<sources>$(RICHTEXT_SRC)</sources>
<library>advdll</library>
<library>htmldll</library>
<library>xmldll</library>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
</dll>
<lib id="richtextlib" template="wx_lib"
cond="SHARED=='0' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
<sources>$(RICHTEXT_SRC)</sources>
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
</makefile>

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