Compare commits

...

683 Commits

Author SHA1 Message Date
Bryan Petty
ebcb3fbdf1 This commit was manufactured by cvs2svn to create tag
'CPPUNIT_1_10_2'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/CPPUNIT_1_10_2@40635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-16 19:15:28 +00:00
Michael Wetherell
2aa148634e Import cppunit.m4 from cppunit 1.10.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/CPPUNIT@40634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-16 19:15:28 +00:00
Bryan Petty
60292dc364 This commit was manufactured by cvs2svn to create branch 'CPPUNIT'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/CPPUNIT@35558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 13:24:14 +00:00
Vadim Zeitlin
948b08e2ca added all .m4 files used by our configure; run aclocal with -I build/aclocal argument now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 13:24:14 +00:00
Julian Smart
12c6934146 Documented GTK+ ~wxWindow fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 11:43:25 +00:00
Julian Smart
02c3e53b45 Applied patch 1283609 GTK window dtor + wxGrid + cellEditor ==> crash
David Surovell, OSAF


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 10:11:36 +00:00
Stefan Csomor
19c46ab5f3 wxMac changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 05:19:26 +00:00
Vadim Zeitlin
c74b77ed51 get rid of wxClientDC::m_oldFont, it wasn't really used (this fixes crash introduced by last change to this code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 01:19:28 +00:00
Vadim Zeitlin
72e4e6a397 cache results of Motif 2 and Motif-is-Lesstif tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 01:10:16 +00:00
Vadim Zeitlin
fa1346df91 pruned the list of directories to search for headers/libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 00:53:06 +00:00
Vadim Zeitlin
e7272c0856 finally really fixes IRIX build:
- determine the name of the standard libraries directory (lib, lib32, lib64
   or lib/64) and use it to find other standard libraries
 - look in default libraries locations after checking the other ones, not
   before


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 00:44:06 +00:00
Julian Smart
404914c6f6 Include settings.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 23:40:01 +00:00
Vadim Zeitlin
15b17d22b0 turn off warning 3970 for SGI CC (see comment for explanation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:40:40 +00:00
Julian Smart
a33c7e9933 Resaved corrupt libs.bmp again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:28:52 +00:00
Vadim Zeitlin
a8793ff9ce don't put default library paths in SEARCH_LIB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:14:05 +00:00
Vadim Zeitlin
2296fe5018 check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default library paths to LDFLAGS (fixes IRIX build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:10:33 +00:00
Vadim Zeitlin
2831eb2dd5 removed weird comparison of m_oldFont with -1 (this doesn't compile with SGI CC in 64 bit compilation mode and doesn't make any sense anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:01:58 +00:00
Vadim Zeitlin
a4588fd1df use wxPtrToUInt() instead of casting pointers to int which dosen't work in 64 bit compilation mode with SGI CC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 22:00:32 +00:00
Vadim Zeitlin
2263a14efc 64 bit compilation fix (pointer can't be cast to int); code simplification (don't duplicate code in GetArm/LabelPixmap)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:54:54 +00:00
Vadim Zeitlin
e6b2a3b383 documented wx_truncate_cast()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:08:25 +00:00
Vadim Zeitlin
c781c31638 added wx_truncate_cast and use it (sometimes instead of wx_static_cast) to explicitely show int truncation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:03:45 +00:00
Vadim Zeitlin
17d8a88795 added ping location for IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:02:41 +00:00
Vadim Zeitlin
f64cd1e6b0 avoid assigning 64 bit ints to a 16 bit one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:02:29 +00:00
Vadim Zeitlin
e1bce3caeb removed unused variables and constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:02:03 +00:00
Vadim Zeitlin
002ceb3840 tremoved unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:01:39 +00:00
Vadim Zeitlin
9bb50fd0b0 use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:01:01 +00:00
Vadim Zeitlin
0ea2339167 checking whether a size_t page index is >= 0 is unnecessary (and generates a SGI CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:00:47 +00:00
Vadim Zeitlin
d6b30150b2 colourSize was probably supposed to be used and not just defined and then forgot about (thanks for SGI CC for a nice warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:00:04 +00:00
Vadim Zeitlin
258e7b2562 remove unused wxTrue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 20:58:55 +00:00
Vadim Zeitlin
1602d4d0fb declare wxCalendarEvent ctor as inline before it's used (which happens before its definition unfortunately) (fixes SGI CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 20:56:29 +00:00
Julian Smart
fe404d1afc Applied [ 1294048 ] [wxMSW] Correct splitter sash drawing on XP
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 20:34:53 +00:00
Julian Smart
cec46079ae Applied patch [ 1292827 ] [wxMSW] nested wxStaticBox fix
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 20:27:19 +00:00
Stefan Csomor
a749a99f08 fixing visibility checks for native toolbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 14:18:50 +00:00
Julian Smart
1d20b7f2c6 Minor doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 12:53:07 +00:00
Julian Smart
e536d73ac4 Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 08:11:23 +00:00
Włodzimierz Skiba
c40691a064 angle bracket problem fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 18:25:44 +00:00
Vadim Zeitlin
a3fc2e6c94 added tech note describing how to add a new wxUSE_XXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 16:18:32 +00:00
Michael Wetherell
9dbe002289 Cygwin compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 15:00:45 +00:00
Włodzimierz Skiba
60e193718c Assert correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 14:53:39 +00:00
Włodzimierz Skiba
ad0ac642d5 Native spline drawing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 12:55:05 +00:00
Julian Smart
1d421f0c39 Define SQLUINTEGER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 11:22:35 +00:00
Julian Smart
e716b9bee1 Applied patch [ 1286701 ] fix for compiling odbc with MS VC8 on x64
also define SQLTCHAR for DMC++


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 11:03:53 +00:00
Vadim Zeitlin
a141e01844 (blind) CE compilation fix: declare wxToolBarNameStr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 10:28:40 +00:00
Julian Smart
f1b747eb88 Script updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-16 08:51:48 +00:00
Włodzimierz Skiba
389076f148 wxUSE_SPLINES markup and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-15 15:26:27 +00:00
Włodzimierz Skiba
b11729f149 Splines sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-15 15:18:37 +00:00
Julian Smart
9a1e758d89 Doc fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 21:21:41 +00:00
Michael Wetherell
d2797f557a Fixes for passing non-PODs via '...'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 21:10:34 +00:00
Michael Wetherell
bc2defe275 ddesetup.h becomes ipcsetup.h, missing part of patch 1263950 Jurgen Doornik
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 21:08:03 +00:00
Michael Wetherell
b7f64d345f Regenerate after change to install of wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 15:56:38 +00:00
Vadim Zeitlin
f58585c091 renamed wxMotif::wxTLW::DoCreate() to XmDoCreateTLW() to avoid conflicts with
DoCreate()s in derived classes and removed DoDestroy() entirely because there
was really no advantage in having it (it can't be called fom base class dtor)

also made XmDoCreateTLW() pure virtual which required changing
IMPLEMENT_DYNAMIC_CLASS into IMPLEMENT_ABSTRACT_CLASS for wxTopLevelWindow in
common code but this made sense anyhow because wxTLW should be an ABC anyhow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 14:36:02 +00:00
Vadim Zeitlin
ed05b5c6e1 dialog creation function should be extern C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 14:24:31 +00:00
Vadim Zeitlin
a54930e05d renamed arg[cv] parameters to not hide wxApp members
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 14:22:16 +00:00
Vadim Zeitlin
da8cf7236e more non-const string literal warnings correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 14:21:16 +00:00
Vadim Zeitlin
9122d155ab use -erroff=E_NO_EXPLICIT_TYPE_GIVEN option with Sun cc to avoid hundreds of warnings from Sun X11 headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 13:18:10 +00:00
Dimitri Schoolwerth
94500b3284 reverted last changes which were false alarm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 12:08:24 +00:00
Stefan Csomor
e828c96ac2 adding Robert Lang's native CG-Bezier patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 12:05:48 +00:00
Stefan Csomor
fea3713c03 adding Robert Lang's native CG-Bezier patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 11:49:31 +00:00
Mart Raudsepp
ae3cd595dc "See also wxListView" link for wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 00:09:29 +00:00
Vadim Zeitlin
5080e86f30 made XPM data const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:50:13 +00:00
Vadim Zeitlin
f1db433a3b added wxMOTIF_STR() macro casting away string literal constness for use with Motif functions taking char *; use it when needed to suppress warnings about string literals being treated as non-const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:49:07 +00:00
Vadim Zeitlin
3f62badb5f unihde base class virtual functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:37:11 +00:00
Vadim Zeitlin
a13acfd803 clipboard handler must be extern C (Sun CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:36:50 +00:00
Vadim Zeitlin
fc9b078cc5 X error handler should be extern C (SunCC warning fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:23:46 +00:00
Vadim Zeitlin
86ac4a2207 warning fixes for Sun CC: extern C, non-const string literals
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:22:56 +00:00
Włodzimierz Skiba
1229a1e7bf Better fix for 'int i' used twice in the same block.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:06:41 +00:00
Włodzimierz Skiba
4a55909399 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:04:22 +00:00
Vadim Zeitlin
1d54b9d297 fixed virtual function hiding for LoadBitmap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:04:10 +00:00
Włodzimierz Skiba
c493691d62 Missing includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 16:02:37 +00:00
Vadim Zeitlin
0d2c74c6ef use WX_DEFINE_ARRAY_PTR for anarray of pointers (fixes Sun CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 15:58:50 +00:00
Vadim Zeitlin
defbeca1b8 use extern C around signal handler declaration (fixes Sun CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 15:57:02 +00:00
Vadim Zeitlin
c15b8bfd6f qsort() should be passedonly extern C functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 14:35:50 +00:00
Vadim Zeitlin
15dc68b6b8 fixed Sun CC warning about local variable read hiding wxStreamBuffer::read
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 14:34:38 +00:00
Vadim Zeitlin
8d79ccefda fixed Sun CC warning about arg[cv] parameters hiding wxApp members
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 14:30:18 +00:00
Vadim Zeitlin
200a992309 and now it even compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 13:47:04 +00:00
Vadim Zeitlin
d1f65ffa65 fix for last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 13:45:39 +00:00
Vadim Zeitlin
0331b385a8 removed strcpy to fixed buffer (do it the right way: cf rev 1.54)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 13:30:13 +00:00
Dimitri Schoolwerth
451f6363c9 fixed uninitialized variable (depending on wxChoice ctor used it resulted in an out of bounds wxChoice::GetSelection() return value)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 12:54:59 +00:00
Mattia Barbon
95e33ad869 Add one more encoding name for EUC-JP for Solaris 8.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 21:22:17 +00:00
Mattia Barbon
9cb6c9a024 Honous initial position for wxSpinCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 20:06:31 +00:00
Mattia Barbon
24490a1c72 Revert change 1.131 which actually broke inital size handling.
Set background colour for all widgets (same as foreground colour).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 20:04:56 +00:00
Václav Slavík
9f0ff522c7 fixed presets installation for scrdir!=. case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 19:00:24 +00:00
Vadim Zeitlin
abc1acc90d removed stray ^Ms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 14:27:02 +00:00
Vadim Zeitlin
95dc6a2b1d VC++ /Wp64 warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 13:02:34 +00:00
Kevin Hock
cff58b5299 Send mouse leave events in HandleMouseMove if HAVE_TRACKMOUSEEVENT is defined and the window has captured the mouse. This used to be done in OnInternalIdle, which now only sends leave events when HAVE_TRACKMOUSEEVENT is *not* defined. Patch from Jamie Gadd, posted 9/10/2005 on wx-dev.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 19:54:58 +00:00
Julian Smart
f9daf953d6 Applied [ 1283696 ] wxDC::GetPartialTextExtents crashes on empty strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 18:37:52 +00:00
Julian Smart
f277ea12a6 Updated change log
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 18:36:41 +00:00
Julian Smart
2e11bb424c Applied [ 1235509 ] wxCocoa unicode wxT("fixes")
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 18:34:58 +00:00
Julian Smart
9d86099269 Applied patch [ 1263950 ] wxConnection fixes for Unicode
By Jurgen Doornik


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 18:31:34 +00:00
Julian Smart
41884be320 Applied patch [ 1284335 ] doc update for wxString::operator[]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 18:04:35 +00:00
Vadim Zeitlin
95af070abd unused var warning in Mac build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 12:09:35 +00:00
Vadim Zeitlin
1c36a9d335 use given position for page insertion instead of trying to find the page to insert before (bug 1287730)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:55:48 +00:00
Vadim Zeitlin
4f7ee81a08 added ToLong/ULong/Double() tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:47:11 +00:00
Vadim Zeitlin
731fa21e8c clarified ToULong() behaviour with negative numbers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:44:45 +00:00
Vadim Zeitlin
21ed3f204a show that key codes are defined in wx/defs.h (patch 1284054)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:31:26 +00:00
Vadim Zeitlin
cdf0ff0ff1 accept grey PNM images (patch 1285885)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:18:36 +00:00
Vadim Zeitlin
39a7f085a4 Respect wxListItem::m_mask in general list control Set/GetItem() and allow
them to be used to change/query the item selection and focus status (second
part of patch 1264533 from Ryan, modified to be backwards compatible)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:14:26 +00:00
Vadim Zeitlin
bf354396f6 wxMediaCtrl patch from Ryan:
- factored out Active X code into separate files
- also refactored common part of all backends in mediactrlcmn.cpp
- adds async loading from URLs support to Mac version
- support for ShowPlayerControls() in Mac wxMediaCtrl
- more minor bug fixes in the MSW version and the sample

(this is slightly modified patch 1264533 (without the list control part))


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-11 11:04:00 +00:00
Michael Wetherell
86e778e267 Improve instructions for compiling with djgpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-10 22:57:24 +00:00
Michael Wetherell
6565d564cb Compile fix for VC++ 5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-10 21:21:27 +00:00
Michael Wetherell
41faf80727 Update to zlib 1.2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-10 21:15:17 +00:00
Michael Wetherell
9c00f5b593 This commit was generated by cvs2svn to compensate for changes in r35455,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-10 20:52:12 +00:00
David Elliott
8c80d38463 Use AC_CHECK_TOOL rather than AC_CHECK_PROG for AR, RANLIB, STRIP, RESCOMP,
and DLLTOOL.  This automatically searches for tools with a prefix of
"$host_alias-" when cross compiling then falls back to the unprefixed tool name
if that fails.  If the user specifies the tool using the appropriate variable
(e.g. CC, CXX, AR, RANLIB, STRIP, etc.) then it will be checked as is.

Removed the major hack that did something similar to this but simply
ignored user-provided variables and used default tool names.  For example,
CC was locked to $host_alias-gcc when cross compiling even if the user
specified CC on the configure command-line.

This brings wxWidgets in line with other autoconf 2.5x projects.  The only
downside to this approach is that our old method would fail if
$host_alias-toolname was not present whereas the autoconf method will silently
use the host compiler (which is usually _not_ what the user wants).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 22:17:09 +00:00
Julian Smart
cff614f601 Applied patch [ 1232933 ] [WinCE] wxDateTime incorrect reading
By bastekx - eba_k


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 20:49:05 +00:00
Julian Smart
48beac4c55 Moved definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 20:45:08 +00:00
Włodzimierz Skiba
bf8ca20d37 Fixed wxListbook and wxChoicebook internal layout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 16:30:19 +00:00
Julian Smart
e78e858331 WinCE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 16:29:35 +00:00
Julian Smart
cc4f5ad809 Restored missing SS_SUNKEN for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 16:20:27 +00:00
Roman Rolinsky
c00266964a fix for toolbar highlighting (not done for main toolbar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 15:47:27 +00:00
Julian Smart
f50de1504e Applied patch [ 1281902 ] fix for wxJoystick under Linux
From John Ratliff


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 14:50:27 +00:00
Julian Smart
60b0bd1dd1 Applied patch [ 1283943 ] Fix crash in GSocket::Select
From Paul Rupe


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 14:44:15 +00:00
Julian Smart
cde5a85767 Applied patch [ 1284913 ] [DOC] Removes msw.staticbitmap.htclient from sysopt.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 14:40:53 +00:00
Julian Smart
625279a99f Updated date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 14:37:03 +00:00
Julian Smart
e7dfcb8ea4 Minor doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 14:33:41 +00:00
Roman Rolinsky
34b29ae796 0.1.6-5
fixed testing for non-top-level objects


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 10:44:28 +00:00
Roman Rolinsky
14653d3b83 testing for top-level objects only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-09 09:35:07 +00:00
Chris Elliott
96a9f4e8dd use env var for daily build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-08 14:02:57 +00:00
Michael Wetherell
3f3a6949a6 Forgot to put the previous (v)snprintf commit inside '#ifdef __cplusplus' which
is needed for the inline function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-07 19:49:39 +00:00
Michael Wetherell
62fa8b3a1d Handle the case when (v)snprintf have the format declared as char* instead of
const char*.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-07 18:28:03 +00:00
Kevin Ollivier
c4295812f4 Wrapper script for pulling a CVS revision and making tarballs from it. This is afirst attempt; eventually it will re-bake automatically and handle docs completely (once I look at Chris Elliott's script.)
The eventual idea is that you should be able to run this script on all three platforms and it will generate all the tarballs and post them to a deliver directory, which a script would then upload.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-07 05:08:55 +00:00
Kevin Hock
3f39c25469 wxApp destructor is virtual [ patch 1283503 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-07 01:05:52 +00:00
Chris Elliott
90f5e43731 daily build unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-06 13:49:24 +00:00
Chris Elliott
cc48c73f3c daily build of windows-format docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-06 13:31:17 +00:00
Kevin Ollivier
a571cd8c60 Adding --silent option so that you can batch build tarballs without being prompted to confirm values for each.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-06 00:18:35 +00:00
Włodzimierz Skiba
ae6c8147aa Code clarification.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 18:10:46 +00:00
Włodzimierz Skiba
d83c04e6a5 Launch default browser.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 18:07:00 +00:00
Włodzimierz Skiba
1afce1a8df Fix for [1250089] 'wxHtmlHelpFrame uses constants instead of variables'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 17:43:54 +00:00
Włodzimierz Skiba
6fbf4a60fe 'i' is already used in this scope so make it clearer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 17:39:15 +00:00
Włodzimierz Skiba
d334418da4 'mark' is already used in this scope so make it clearer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 17:37:06 +00:00
Jouk Jansen
22e2e60cad Committing in .
OpenVMS configuration updated

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 12:43:06 +00:00
Vadim Zeitlin
8e2ff10c71 fixed bug in generation of the To: header: trailing comma prevented the messages from being ever sent out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-05 00:15:32 +00:00
David Elliott
0fb7068d73 Removed gsockosx.cpp which had been copied to src/mac/corefoundation long ago.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-04 19:40:54 +00:00
Mart Raudsepp
b636c599e7 Fix wxGLCanvas ctor prototypes in docs. Closes bug #1237072.
TODO: document the meaning of sharedCanvas arg.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-04 15:46:20 +00:00
Stefan Csomor
89e94a4bff support for fractional characters widths under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-04 12:52:46 +00:00
Mart Raudsepp
ff33410699 [wxTLW-GTK] Don't connect to the configure_event twice. This caused double wxMoveEvents being emitted, and some other
stuff done on the same data twice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-04 10:52:11 +00:00
Mart Raudsepp
3dc786e02e -Wundef fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-04 10:33:09 +00:00
Vadim Zeitlin
6fbc7b5936 undef wxUSE_DIALUP_MANAGER before redefining it as 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 23:30:48 +00:00
Vadim Zeitlin
e08ed3082a use libSgm with wxMotif if available, this seems to be useful under IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 23:27:20 +00:00
Vadim Zeitlin
0beb873533 include wx/defs.h (and hence wx/platform.h and so really fix the bug 1105676)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 23:16:50 +00:00
Vadim Zeitlin
d7e0024b09 fix showing keyboard cues under Win2k/XP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 23:00:22 +00:00
Vadim Zeitlin
de8a305a7f made wxRegKey bugfix note more detailed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 22:58:30 +00:00
Ron Lee
6758d3d3a3 Add --selected_config option for reporting to secondary build configration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 06:28:23 +00:00
Kevin Hock
05036fe062 Multi-thread fix from Angel [ patch 1281057 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 01:01:06 +00:00
Vadim Zeitlin
2edd85f22b /usr/sbin is a better default location for sendmail than /usr/lib nowadays
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-02 23:36:19 +00:00
Stefan Csomor
8b6b8e21a4 corrected error code for http responses with no content-length indicated (from READ_ERROR to EOF) so that clients of streams can rely on getting EOF or NO_ERROR when everything is ok
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-02 17:30:31 +00:00
Václav Slavík
dec531b232 added GetFirstSibling and GetLastSibling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-02 15:54:06 +00:00
Vadim Zeitlin
08f8037109 ignore hidden buttons when emulating clicks on them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-02 08:20:05 +00:00
Mart Raudsepp
42c60e749f [wxGTK2] Plug memory leak in wxMemoryDC (approx. 525 bytes per object)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-02 05:14:21 +00:00
Vadim Zeitlin
49c48f8190 ignore hidden windows when deciding if the MDI parent frame should be visible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 23:28:40 +00:00
Vadim Zeitlin
3ee39f97af hide MDI parent frame if it's empty and a new child has been created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 23:18:39 +00:00
Vadim Zeitlin
5887690b5e fix for -Wundef warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 21:47:12 +00:00
Vadim Zeitlin
f730d32b0f corrected typo and changed wording of an assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 21:29:18 +00:00
Włodzimierz Skiba
5a23a495e4 Missing wxGetOsDescription().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 17:04:08 +00:00
Włodzimierz Skiba
e7cc2f6502 GCC warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 15:56:09 +00:00
Włodzimierz Skiba
9f29226d68 Sizing fixes for wxListbook and wxChoicebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 15:53:16 +00:00
Vadim Zeitlin
8648883bfe corrected Get() return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 14:46:18 +00:00
Vadim Zeitlin
d466385131 s/wxWindows/wxWidgets/g
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 14:05:35 +00:00
Stefan Csomor
8138cfecaf optimizing for multiple Realize calls in sequence, moving EventHandler push to toolbar item creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 09:32:18 +00:00
Stefan Csomor
04732a7f27 moving and slightly extending the comment on CGState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 06:36:21 +00:00
Stefan Csomor
34a4e91286 support for the AllPages attribute, proper round trip and fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 05:52:20 +00:00
Vadim Zeitlin
a57ac1c418 better handling of empty MDI parent frame visibility: show it only when there are no MDI children shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-01 01:26:49 +00:00
Vadim Zeitlin
d248a65cdd include wx/defs.h before testing for wxUSE_TEXTDLG defined in it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 23:48:11 +00:00
Vadim Zeitlin
4a60e3f007 hide the MDI parent frame instead of just moving it away (why didn't I do it like this before?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 22:53:51 +00:00
Vadim Zeitlin
484bdc6a72 added link to wxFileHistory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 22:35:49 +00:00
Vadim Zeitlin
6774a5d355 added Open() mode parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 22:25:19 +00:00
Vadim Zeitlin
d04a92f097 update from José Eduardo de Carvalho Diniz
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 22:16:08 +00:00
Vadim Zeitlin
2bdd6b12dd Raise() and Lower() work for any windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 21:42:03 +00:00
Michael Wetherell
e051b34ef2 Fix for detection of motif headers when they are in a different place to X11,
correct error message (CPPFLAGS instead of CFLAGS) and add /usr/pkg/include
to SEARCH_INCLUDE (usual location on NetBSD).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 20:22:49 +00:00
Vadim Zeitlin
d12aef517e regenerated after recent changes to configure.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 16:13:11 +00:00
Stefan Neis
9e03e02d0c Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 15:48:41 +00:00
Vadim Zeitlin
47547fbe45 show the name of incrimanted class in RTTI registration assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 15:27:16 +00:00
Stefan Csomor
72ba915e7e CoreGraphics : experimental colour pattern / dash support (by OSAF) (turned off by default) - fixes in arc and multiline drawings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 14:55:13 +00:00
Stefan Csomor
a06e389f0a setting CG origin to printable area
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 14:49:08 +00:00
Stefan Csomor
5d5c59e9c4 somehow an additional call moved in... removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 14:46:55 +00:00
Stefan Csomor
35d1986eb8 setting All Pages if To is 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 14:20:41 +00:00
Vadim Zeitlin
e426ff2972 create tags file for wxMac/Carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 14:04:00 +00:00
Chris Elliott
8e432792b3 add wxGTK to daily build, an remove faulty dsp files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 10:49:31 +00:00
Vadim Zeitlin
6ded0416df corrected header file name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-31 10:24:05 +00:00
Vadim Zeitlin
c9ee46c3a5 return a more useful value from wxJoystick::GetProductName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 23:39:56 +00:00
Vadim Zeitlin
2971ea9d51 moved X11/XKBlib.h test after main X11 tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 23:30:06 +00:00
Vadim Zeitlin
aca2d2de32 (blind) fix for wxSound link problem under NetBSD with OSS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 23:28:35 +00:00
Vadim Zeitlin
ae07248072 define _LANGUAGE_C_PLUS_PLUS for IRIX (closes bug 1105676)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 19:23:11 +00:00
Vadim Zeitlin
0ab82ca91e better looking fallback resources for IRIX (patch from Riccardo Mottola)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 19:20:06 +00:00
Włodzimierz Skiba
8a9a7f264c wxCocoa build fix in response to wxLogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 17:30:43 +00:00
Włodzimierz Skiba
99f0cdf2e9 Missing wxGetOsDescription() for wxMGL in response to undefined reference in wxLogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 17:25:58 +00:00
Vadim Zeitlin
2cbdf975a9 corrected wording of last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 14:02:02 +00:00
Vadim Zeitlin
42b1fb630d generate mouse events for all static controls, not just wxStaticLine (patch 1276413 by Jamie Gadd)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 13:54:29 +00:00
Vadim Zeitlin
4ce18ecb66 fix for status bar positioning: account for wx client area origin (replaces patch 1276316)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 08:33:50 +00:00
Vadim Zeitlin
f0794a4ccd fix for gcc warning about base class initialization in copy ctors given with -Wall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-30 00:48:34 +00:00
Mart Raudsepp
3c542a4de0 Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup/themes, querying for an
nonexistent facenames family through wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) on startup.
Document wxFont work in changes.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 21:14:18 +00:00
Chris Elliott
18c9aebeca fix as discuused on wxdev for bc54
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 15:46:55 +00:00
Vadim Zeitlin
b624acad7e another (blind) compilation fix for Borland after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 14:09:51 +00:00
Vadim Zeitlin
df7998fce5 compilation fix; unTABbed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 13:59:39 +00:00
Vadim Zeitlin
bd118d35c6 (blind) compilation fix for Borland after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 13:48:56 +00:00
Vadim Zeitlin
fffdb4c9c7 update from Martin Srebotnjak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 10:32:02 +00:00
Mart Raudsepp
2696b11cd5 [wxGTK2] Runtime check for pango_font_family_is_monospace in wxFontEnumerator (gtk2.4 runtime check) to allow wxGTK2
applications compiled against gtk2.4 or newer to work with gtk2.2 or older runtime.
Removed HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE configure check in case of wxGTK2, as __WXGTK24__ is now used for that.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 04:33:15 +00:00
Michael Wetherell
4979a56c78 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 01:59:36 +00:00
Vadim Zeitlin
d2822091a7 regenerated after libcairo filtering out changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 01:31:22 +00:00
Mart Raudsepp
c42f011ed6 [wxGTK2] Runtime check for pango_font_family_is_monospace in wxFont::GetFamily (gtk2.4 runtime check) to allow wxGTK2
applications compiled against gtk2.4 or newer to work with gtk2.2 or older runtime. wxFontEnumerator TODO


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-29 01:18:07 +00:00
Mart Raudsepp
631e67db81 gtk+-2.x runtime compatibility when compile-time gtk+ version is 2.7+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 23:46:20 +00:00
Vadim Zeitlin
84cefcb0eb use #ifdef and not #if (fixes -Wundef warnings reported in bug 1273111)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 16:38:55 +00:00
Vadim Zeitlin
5e99793eca fixed cursor flicker (patch 1254492 by Hans P. Palbol)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 16:33:18 +00:00
Vadim Zeitlin
08890e275c spelling fixes and other minor corrections to the docs (patch 1273930 by Andreas Mohr)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 16:25:43 +00:00
Vadim Zeitlin
c07103f267 fixed status bar positioning to work both with and without sizers (patch 1199639 by Jamie Gadd)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 16:21:36 +00:00
Vadim Zeitlin
f7040b5fe6 added IsSizeDeferred() (part of patch 1199639)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 16:19:45 +00:00
Vadim Zeitlin
4884b02b08 fixed label case so that the link works (patch 1263943)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 15:46:28 +00:00
Vadim Zeitlin
c15b71ae08 fixed bug in wxStreamBuffer::Read(wxStreamBuffer *) and improved its documentation (patch 1273774 by Paul Cornett)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 15:44:15 +00:00
Vadim Zeitlin
44bf7fe3d0 fixed wxRegionRefData copy ctor (patch 1274403)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 15:37:54 +00:00
Vadim Zeitlin
3e7cd2f52b dirty hack to fix deprecation warning when building wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 14:36:46 +00:00
Vadim Zeitlin
f0e434d0f8 added test file loaded by the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:34:48 +00:00
Vadim Zeitlin
413e5c784d ignore sample-created XPM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:33:57 +00:00
Vadim Zeitlin
4f31d61012 added wxChoice:: and wxCombobox::GetCurrentSelection()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:33:31 +00:00
Vadim Zeitlin
b7ee3acf62 added wxDateTime::[Make]FromTimezone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:31:20 +00:00
Vadim Zeitlin
3b6c3fc8c5 test centering file dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:27:33 +00:00
Vadim Zeitlin
f0cf38b706 set or unset column image on column click
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:27:08 +00:00
Vadim Zeitlin
ba76a609e4 ignore dummy.txt used by the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:26:04 +00:00
Vadim Zeitlin
030f50ef4a modified GetLastMenuItem() to also take into account the popup menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:17:29 +00:00
Vadim Zeitlin
7c7f4cff9f let ctags know about (and ignore) WXDLLIMPEXP_BASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:12:50 +00:00
Vadim Zeitlin
774960ce3c corrected #ifdefs testing wxUSE_UNICODE_MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:11:18 +00:00
Vadim Zeitlin
d8ecf75446 ignore evc libs directories
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:07:35 +00:00
Vadim Zeitlin
d26adb9df7 Fixed several bugs in wxDateTime timezone handling:
- ToTimezone() and MakeTimezone() now work as expected
 - added and documented FromTimezone() and MakeFromTimezone()
 - Set(double jdn) interprets jdn always in UTC
 - updated ParseRfc822Date() timezone handling
 - removed workarounds for old bugs from the test


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 13:06:36 +00:00
Mattia Barbon
5378558e5c No significant changes. Remove reliance on wx/bookctrl.h being
included in wx/sizer.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:54:56 +00:00
Mattia Barbon
17ec440be6 Add recent wxMotif changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:31:22 +00:00
Mattia Barbon
13abe5c0c8 Improved wxStaticBox border calculation for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:07:34 +00:00
Mattia Barbon
a7f17c90e5 Remove useless code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:05:33 +00:00
Mattia Barbon
8b7b0d67b0 All toplevel windows without the wxNO_BORDER style should
have a border under MWM, too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:02:13 +00:00
Mattia Barbon
6bae67261c Improve sizer support in generic wxNotebook. Fix the widgets sample
to take advantage of it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 08:00:25 +00:00
Mattia Barbon
d30814cdf2 Under wxMotif, default buttons are bigger than other buttons,
hence Realize() must be called after default button has been set.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 07:55:43 +00:00
Mattia Barbon
4e025aa206 Implement GetMinSize for wxMotif wxButton. Helps solfing sizing
problems in generic common dialogs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 07:51:59 +00:00
Vadim Zeitlin
3e81caa51b added wxABI_VERSION test around ToDouble()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 00:34:37 +00:00
Vadim Zeitlin
2bb7951e0c added wxLongLong::ToDouble()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 00:33:20 +00:00
Vadim Zeitlin
e7aaf2dedd added wxLongLong::ToDouble()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-28 00:03:30 +00:00
Vadim Zeitlin
0f71b9da7f added operator==() and !=
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-27 19:29:06 +00:00
Stefan Csomor
2c1dbc95e1 several fixes, guards, and an implementation for removal of native toolbar items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-27 16:43:19 +00:00
Stefan Csomor
0e71e8459f allowing a clear of a graphic context, and set the pen and brush after a graphics restore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-27 13:57:48 +00:00
Stefan Csomor
c725df80c5 save correctly oriented GraphicState and clear Context before destruction (is invalid at that point)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-27 13:55:49 +00:00
Vadim Zeitlin
53e2e87c9b open fstream with ios::binary flag to be compatible with wxFileStream and to avoid mangling binary files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-26 22:52:29 +00:00
Julian Smart
58161defc3 Warning corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-26 08:21:43 +00:00
Chris Elliott
966b84b914 fix gpf in mdi sample with motif when child is closed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 21:58:22 +00:00
Vadim Zeitlin
3147bb585a pressing enter now activates the default button even when the focus is on a checkbox or radio button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 19:27:43 +00:00
Vadim Zeitlin
8dbb7967d4 don't mention undocumented wxOwnerDrawn in the docs (patch 1267562)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 19:16:53 +00:00
Vadim Zeitlin
f8387e15ee only give error about missing richedit.dll once (the code was already supposed to work like this but didn't, patch 1273177)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 19:14:44 +00:00
Włodzimierz Skiba
d110378748 [ 1273159 ] logical vs. bitwise operators, part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 19:10:47 +00:00
Włodzimierz Skiba
3b9b80c0e2 RTTI and exceptions settings for WinCE are restored.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 16:31:42 +00:00
Mart Raudsepp
b20cb04588 [wxGTK2] Check if a family wasn't found for the description in GetFamily()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 12:46:57 +00:00
Michael Wetherell
a379a35f4b Make TEST_DIR the current test, so that the djgpp build can work on the tinderbox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-25 11:17:06 +00:00
Mattia Barbon
101b477808 As reported by Chris Elliott some releases of Lesstif crash
when setting the font list of a widget. The code is disabled for
now for all Lesstif versions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 21:29:09 +00:00
Václav Slavík
07910a9a7e install bakefile presets (patch 1253143)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 19:20:18 +00:00
Włodzimierz Skiba
dbcf11198a Warning fix for wxLogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 18:35:30 +00:00
Włodzimierz Skiba
5c66e5b2b2 Missing wxUSE_... flags and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 17:56:29 +00:00
Włodzimierz Skiba
71307412f5 Missing wxUSE_... flags and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 17:47:11 +00:00
Vadim Zeitlin
5e23e2d59a compilation fix for systems with XtIMSignal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 17:36:00 +00:00
Vadim Zeitlin
4c620d1900 compilation fix: DefaultVisual() needs Display, not WXDisplay (and code cleanup in wxGetSubPixmap() as well)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 15:41:33 +00:00
Michael Wetherell
cfd1ac216d Move LabelWrapper, TextSizerWrapper classes out of function body to accommodate some older compilers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 14:59:36 +00:00
Vadim Zeitlin
4f66d445e1 fixed -Wundef warning for HAVE_SCHED_H
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 12:11:14 +00:00
Vadim Zeitlin
60e4975cb8 fix for -Wundef warning for HAVE_XIM under GTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 11:17:05 +00:00
Vadim Zeitlin
285ba64d0d #undef things which require other, disabled, ones, instead of re-#defining them as 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 11:16:04 +00:00
Vadim Zeitlin
8a43eaecc1 corrected comment explaining wxABORT_ON_CONFIG_ERROR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 11:14:27 +00:00
Włodzimierz Skiba
470731287a wxUSE_STATTEXT guard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 07:57:49 +00:00
Włodzimierz Skiba
88d2e56706 [1267725] Wrong operator for logical/bitwise operation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 06:32:56 +00:00
Mart Raudsepp
d332c51456 [wxGTK2] Don't duplicate code inside wxFontRefData::InitFromNative()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 00:25:19 +00:00
Michael Wetherell
0042166636 Workarounds for old versions of gcc on hpux: define __STDC_EXT__ when it is
need and use -lpthread instead of -pthread when the latter is not supported.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 00:23:21 +00:00
Vadim Zeitlin
0683aca66e fix for the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:34:06 +00:00
Vadim Zeitlin
30962327c9 use wxString::Format(), calling string.Format() has no effect patch 1267345)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:27:40 +00:00
Mart Raudsepp
1e8774da27 [tex2rtf] Remove wxWidgets-2.0 compatibility guards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:19:20 +00:00
Vadim Zeitlin
5cb61fed97 some compilers don't like statics in inline functions, even if they're const -- replaced with an enum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:12:48 +00:00
Vadim Zeitlin
84ae7ca4f6 check for missing statfs() prototype (happens at least under AIX 4)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:12:37 +00:00
Michael Wetherell
c5035065a8 Compilation fix for wxUSE_DRAG_AND_DROP=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 23:10:59 +00:00
Vadim Zeitlin
6ca1005bcb removed attempts to link with unicows.lib using #pragmas for msvc, this doesn't work reliably
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 22:56:41 +00:00
Vadim Zeitlin
09f7f79f2d removed wrong sentence about idle events being sent to TLWs only; explained why you would and wouldn't use RequestMore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 21:37:38 +00:00
Włodzimierz Skiba
c54e5eb0f6 wxOS2/OW warning and build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 16:02:51 +00:00
Włodzimierz Skiba
5f4d35b804 wxOS2/OW warning and build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 15:54:39 +00:00
Włodzimierz Skiba
49fe461056 wxOS2/OW warning and build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 15:41:50 +00:00
Julian Smart
45aee08b3b Don't try drawing the bitmap before it's valid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 07:46:30 +00:00
Stefan Csomor
7adabb9ae8 cleanup and adding the case when the toplevel window itself is the recipient of the drag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 07:43:41 +00:00
Stefan Csomor
0b6db82f16 adding a string for private data identification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 07:37:13 +00:00
Mart Raudsepp
8a15e8ba7a [wxGTK2] Move wxFontRefData::SetPointSize to wxNativeFontInfo. Implement SetFaceName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 00:03:27 +00:00
Mart Raudsepp
7533ba252b [wxGTK2] Move wxFontRefData::SetStyle/SetWeight to wxNativeFontInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 23:56:01 +00:00
Vadim Zeitlin
04e525a00d regenerated after #error changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 23:54:57 +00:00
Vadim Zeitlin
2b36af83fd compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 23:43:08 +00:00
Mart Raudsepp
8c8c4b717a [wxGTK2] Don't query native font for underlined, but return the set value - storing it natively would likely require
the usage of a PangoAttribute, and I'm not sure if that's even different than just storing it inside wxFontRefData.
Not investigating further as PangoAttribute addition would require ABI compatibility breakage anyhow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 23:27:39 +00:00
Mart Raudsepp
b67d14bee0 [wxGTK2] Do what we (I) can wrt the win32 centric wxNativeFontInfo::GetFamily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 23:19:57 +00:00
Vadim Zeitlin
4a767dd5cd added test for snprintf() which may not be present in system headers, treat it similarly to vsnprintf() instead of assuming that it's always there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 22:46:33 +00:00
Mart Raudsepp
5844fc0775 [wxX11] a ROMAN font is with serifs and a SWISS font is without. Set the font to "serif" if it's wxFONTFAMILY_ROMAN
not wxFONTFAMILY_SWISS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 21:58:32 +00:00
Mart Raudsepp
38d446db26 [wxGTK2] Return wxTELETYPE with GetFamily() for monospaced fonts, fixing IsFixedWidth() after it broke completely
after get accessor changes, and returning the right thing in GetFamily() in this case. Other families TODO.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 20:42:03 +00:00
Mart Raudsepp
b578601e3e [wxGTK2] Plug memory leak in wxFontEnumerator::EnumerateFacenames()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 20:25:32 +00:00
Vadim Zeitlin
dd6abbacb9 don't use #error in configure test programs, some compilers (such as SGI mipsPro) treat it as a non-fatal warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 20:22:21 +00:00
Włodzimierz Skiba
1bc4db11b1 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 19:50:54 +00:00
Mattia Barbon
7398fb8170 Compilation fix for Motif 1.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 17:44:43 +00:00
Mart Raudsepp
02d9204cad [wxGTK2] wxFont::Get* - Query native font for information, if the wxFont has an associated wxNativeFontInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 17:22:44 +00:00
Vadim Zeitlin
59afc60f15 use quotes, not angle brackets, for wx headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 16:00:16 +00:00
Stefan Csomor
229f627030 remove the carbon event handlers just before calling DisposeControl to avoid callbacks into zombie windows...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 15:12:02 +00:00
Włodzimierz Skiba
83498ef2b0 Empty string corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 15:00:07 +00:00
Włodzimierz Skiba
790fc140a9 Compensation for bkl 0.1.9.X/eVC4/RTTI bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 14:54:41 +00:00
Stefan Csomor
525ae3fe38 respecting DoDragDrop flags like CopyOnly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 14:53:35 +00:00
Stefan Csomor
6db6bfd1ce correcting DropData behaviour so that preferred format is handled correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 09:52:04 +00:00
Stefan Csomor
6ac23e25b8 correcting Drag Data handling for 'TEXT' and 'utxt'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 08:49:38 +00:00
Stefan Csomor
671478ee46 adapting text object data handling along the GTK2 lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 08:46:08 +00:00
Vadim Zeitlin
0ccaeba319 regenerated after undoing recent HP-UX changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 19:01:02 +00:00
Vadim Zeitlin
d24a5079c5 don't use -threads with gcc under HP-UX, it's for DCE threads and not pthreads (reverts recent commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 18:59:05 +00:00
Vadim Zeitlin
7eb00c80b2 moved __STDC_EXT__ definition for HP-UX from configure to wx/platform.h, like this we can do it only if it's not alraedy defined by the compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 18:57:08 +00:00
Mattia Barbon
62603868bc Regenerated PO files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 16:02:15 +00:00
Mattia Barbon
aeb9a15618 Made wxMotif wxFileDialog translatable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 15:27:40 +00:00
Vadim Zeitlin
9240613a8d fix handling of partially-specified min size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-21 11:14:20 +00:00
Vadim Zeitlin
20bfc1c29f fill in OS info in GetToolkitInfo() (patch 1256409)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:49:12 +00:00
Vadim Zeitlin
5bd98e9354 add information for Palm/CE ports (patch 1256409)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:47:13 +00:00
Vadim Zeitlin
47bd540624 last commit accidentally used out of date aclocal.m4 and so overwrote some previous changes, corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:38:19 +00:00
Vadim Zeitlin
efdf6afeb2 regenerated after HP-UX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:33:03 +00:00
Vadim Zeitlin
b5887a837d vsnprintf() tests correction: check that declaration is const-correct; merged the Metrowerks test with the one for the other compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:20:16 +00:00
Vadim Zeitlin
d66943923d use -threads with gcc under HP-UX instead of -pthread
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:12:24 +00:00
Vadim Zeitlin
be30c667ed only define __STDC_EXT__ in CXXFLAGS for gcc under HP-UX, it's already present in CFLAGS by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-20 15:10:12 +00:00
Vadim Zeitlin
472e73db81 don't forget to modify include/msvc/wx/setup.h and include/wx/msw/chkconf.h when adding a new library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 17:32:07 +00:00
Vadim Zeitlin
14a3591de2 added wxmsw26_media library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 17:29:51 +00:00
Vadim Zeitlin
3c232ecbaf link unicows.lib implicitely when using MSVC and wxUSE_UNICODE_MSLU==1 (thi is used in DLL wx builds)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 17:23:23 +00:00
Vadim Zeitlin
9eeab5fa9d link unicows.lib automatically (and in correct order) if wxUSE_UNICODE_MSLU==1 (this is for the application and is mainly needed when using static wx libs)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 17:15:44 +00:00
Vadim Zeitlin
6f2df739f4 check whether unicows.dll works correctly instead of just crashing if we linked it in wrong order (i.e. not before wx libs)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 17:10:24 +00:00
Vadim Zeitlin
69c54afe21 check for unicows.dll on program starup when wxUSE_UNICODE_MSLU==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 16:47:25 +00:00
Stefan Csomor
5e8c9935fd workaround because regions that were built up, were sometimes being drawn on the screen as well...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 16:29:09 +00:00
Michael Wetherell
f2555abd7a Fix uses of wxUSE_METAFILE, patch 1262723 Paul Cornett
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 13:48:24 +00:00
Michael Wetherell
938ad7687f Document the current behaviour of OnDestroy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 13:45:11 +00:00
Michael Wetherell
eb76ad0b3b Remove duplicate code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 13:24:38 +00:00
Mattia Barbon
6ace5176f6 Use default GUI font for wxMessageDialog and wxFileDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 10:00:23 +00:00
Jouk Jansen
cb542c35fa Committing in .
Some updates for OpenVMS compile support

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 08:14:05 +00:00
Stefan Csomor
92b6cd6289 avoiding recursive KillEvents on the same object, in case the focus gets set to another element in the OnKillEvent Handler ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 06:46:30 +00:00
Vadim Zeitlin
a351409ef2 compilation fix for wxUnivGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 22:16:52 +00:00
Vadim Zeitlin
81e2cbc685 fixed (harmless) unused variable warning in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 21:10:24 +00:00
Vadim Zeitlin
e822273ae0 __WXDEBUG__ must be tested with #ifdef, not #if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 21:03:41 +00:00
Michael Wetherell
f43dc7d3f8 Fix mbstate_t from <cwchar> conflicting with that from <wchar.h> on HP-UX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 19:58:56 +00:00
Michael Wetherell
c1ce4db1de wcslen and wcscmp replacements for systems that lack them, such as djgpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 11:40:40 +00:00
Michael Wetherell
a3c0d7684a Implementations for some of the stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 10:52:10 +00:00
Jouk Jansen
f22d860b26 Committing in .
Updated configuration for OpenVMS

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 07:46:37 +00:00
Mattia Barbon
b0b2263b50 Fix the condition to always #define wxMOTIF_NEW_FONT_HANDLING
(currently always defined to 0 for safety).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 00:41:18 +00:00
Mattia Barbon
8c624a14ad Avoid some -Wundef warning. Check for __WXGTK__ using defined,
not plain #if.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-18 00:35:02 +00:00
Vadim Zeitlin
ce52988a85 tentative fix for large files compilation under HP-UX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 23:13:53 +00:00
Mart Raudsepp
e38bddf552 Specify that "Backward compatibility" is a topic overview in the manual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 21:58:47 +00:00
Mart Raudsepp
f26623c817 [wxGTK2] gtk+-2.8.0 compatibility. Removed the usage of pango_x_get_context to not depend on a fully deprecated
pangox library, which is not pulled in with gtk+-2.8.0. The pango_x_get_context call was (arguably) making font
drawing on top of a wxDC slightly faster on (especially remote) X11 in case of non-antialiased fonts (I was unable to
find a non-antialiased font that actually returns true for GetNoAntiAliasing()).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 21:40:44 +00:00
Vadim Zeitlin
befb44cf2e added GetCurrentSelection() which is the same as GetSelection() for Mac but needed for compatibility with the other ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 14:24:28 +00:00
Vadim Zeitlin
40eb3606eb added GetCurrentSelection(); made GetSelection() behave as documented (and not as before); don't send TEXT_UPDATED events until the combobox is closed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 14:22:41 +00:00
Vadim Zeitlin
bb8051f2fd hacked around wxGTK wxStaticText which doesn't derive from wxStaticTextBase (argh): declare and define Wrap() directly in wxStaticText for this port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 13:47:35 +00:00
Vadim Zeitlin
6ba93d23bf made wxChoice and wxComboBox::GetSelection() return only completed selection in wxMSW; added GetCurrentSelection() with the old behaviour and documented it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 13:30:33 +00:00
Vadim Zeitlin
d6bbc10c94 also added a check of choice selection in idle time (similar to last check in for combobox)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 13:13:42 +00:00
Vadim Zeitlin
644e896d3f don't take wxID_NONE inside #if wxABI_VERSION check: it's (going to be) used inside the library itself and, anyhow, there is no harm in letting even the user code compiled with lower than current wxABI_VERSION to see it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 12:56:21 +00:00
Jouk Jansen
51c742ddf8 Committing in .
Solves link problem of wxMOTIF on OpenVMS

 Modified Files:
 	wxWidgets/include/wx/vms_x_fix.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 06:55:33 +00:00
David Elliott
3e4ca115f5 Upgrade to newest bakefile.m4 to support non-PowerPC Darwin platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 02:09:42 +00:00
David Elliott
cfda0ea87b Allow wxWidgets to be built hosted on any architecture of Darwin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 00:56:55 +00:00
Vadim Zeitlin
dec48aa578 hacked around wxGTK wxStaticText which doesn't derive from wxStaticTextBase (argh): declare and define Wrap() directly in wxStaticText for this port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 00:01:35 +00:00
Vadim Zeitlin
98fe5d46bd added newsince note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 23:55:05 +00:00
Vadim Zeitlin
0db7dfb021 avoid gcc warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 23:52:39 +00:00
Vadim Zeitlin
5d1b49193b added wxStaticText::Wrap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 23:14:34 +00:00
Włodzimierz Skiba
0d29fecd2e Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 20:50:02 +00:00
Włodzimierz Skiba
ebeb1b6ad1 Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 20:47:34 +00:00
Włodzimierz Skiba
bd33d4acf6 Public access to MSWWindowProc() for wxQTMediaBackend::QTWndProc() under wxUnivMSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 20:32:31 +00:00
Włodzimierz Skiba
e27d9a9106 Reuse functionality of wxGetStockLabel().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 20:23:04 +00:00
Julian Smart
89c9b933e3 Added context help styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 15:06:39 +00:00
Vadim Zeitlin
f226be17ad added code showing that at least under Windows wxCombobox::GetSelection() return value changes even before EVT_COMBOBOX is sent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 12:13:56 +00:00
Vadim Zeitlin
a2ec9439a3 don't use wxApp::GetAppName() in the usage message, we want the real argv[0] here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 10:08:04 +00:00
Vadim Zeitlin
442a79c0b4 fixed warning about mismatching dlldecl when building as DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 10:06:35 +00:00
Vadim Zeitlin
c73b4312f9 compilation fix for wxUSE_STL=1 and mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-15 20:09:46 +00:00
Roman Rolinsky
baba4aa5ec 0.1.6-4: replace working for sizeritems and spacers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-15 19:53:33 +00:00
Vadim Zeitlin
f02a4ffa5f replaced annoying wxLogDebug()s with wxLogTrace()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-15 12:11:53 +00:00
Vadim Zeitlin
6b93f25b0a update from Dennis Prochko
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-14 18:45:31 +00:00
Vadim Zeitlin
905e339a93 update for 2.6.1 from Dennis Prochko
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-14 12:07:48 +00:00
David Elliott
1ff36a0a48 Regenerated with new bugfixes from aclocal.m4 and old OS/2 bugfix from
wxAutohacks build/autoconf_prepend-include/autoconf/c.m4


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 22:40:09 +00:00
David Elliott
3b396a2629 Bug fixes from Bakefile CVS HEAD (still using 0.1.9 version though)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 22:38:08 +00:00
Michael Wetherell
217e77c3c0 Let wxGetFileKind(FILE*) return wxFILE_KIND_UNKNOWN for NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 21:08:10 +00:00
Michael Wetherell
ecc201480f Set wxSTREAM_WRITE_ERROR for wxFFileInputStream when open fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 20:53:13 +00:00
Michael Wetherell
8d5bdb7f2b Make the backward compatibility section a topic overview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 20:47:26 +00:00
Michael Wetherell
f83b53a329 Add platform specific .po and .mo files into the distribution script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 20:38:30 +00:00
Julian Smart
992b3f1da4 Fixed dangling pointers bug; radio button was not removing itself from
the cycle when deleted, so when deleting and then adding a radio button, we
get a crash


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-13 09:48:29 +00:00
Michael Wetherell
8804b53fb6 Typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 15:34:01 +00:00
Michael Wetherell
4d931bcca0 Translate '&Help' to '&' for italian Windows only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 15:29:57 +00:00
Roman Rolinsky
0725108f48 some more fixes: tree selection, replacing, wxYield calls removed
(produce infinite recursion)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 14:40:20 +00:00
Julian Smart
a6328131cd Adaptations for PDA-sized screens
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 14:16:05 +00:00
Julian Smart
b23030d6fa Added support for "help" parameter (context help text).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 14:09:24 +00:00
Vadim Zeitlin
c3b7706c4f don't override OnIconized() in the sample, the bug this was working around is now fixed in wxMSW itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:29:28 +00:00
Vadim Zeitlin
6bbe97b71d force update of MDI client window size after the MDI parent frame is iconized and restored, otherwise all kinds of bad things (changes in MDI children positions; possibility to move them above the toolbar and below the status bar; wrong repaining) happen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:24:56 +00:00
Vadim Zeitlin
952f2aaa86 added wxSIZE_FORCE flag for SetSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:21:45 +00:00
Vadim Zeitlin
749870835d check that wxUSE_DC_CACHEING is defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:10:09 +00:00
Michael Wetherell
8fb816ff93 Adds a title to the chart, patch 1242262 Matthew D.P.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 22:53:45 +00:00
Michael Wetherell
1c2ed09a15 Mention converting ANSI->Unicode, patch 1247339 Eric Kow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 21:50:34 +00:00
Michael Wetherell
7147aa4780 #define wxUSE_STD_STRING to 0 rather than #undef it, patch 1255570 from Jan van Dijk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 21:24:42 +00:00
Michael Wetherell
31ad2c402c Undo r1.52 since we get another problem.
http://lists.wxwidgets.org/cgi-bin/ezmlm-cgi?5:sss:65211:200508:khmgllhgjjgnfkhpebip#b


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 19:41:01 +00:00
Václav Slavík
b8c8d204b7 make sure all licence texts are really the same
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 18:46:42 +00:00
Roman Rolinsky
a24d7726e6 one more fix for tree selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 15:57:23 +00:00
Roman Rolinsky
83173c7a4d wxMSW fixes for tree control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-10 14:58:28 +00:00
Roman Rolinsky
03319b655c 0.1.6-1
Support for object_ref. CreateTestWin saves all DOM in temporary
memory file now, to allow reference resolution.

Tree changed to multiple selection (not really supported yet), so
after deleting Unselect can be used (otherwise parent item is
selected automatically which results in scrolling jumps - distracting).

!!! Not tested on wxMSW yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-09 19:27:27 +00:00
Roman Rolinsky
6cb85701e2 SetModified updates window title ('*' is shown if modified)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-09 19:21:28 +00:00
Mart Raudsepp
97a798f7b2 "Include file" -> "Include files" - as in all other docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-09 17:55:38 +00:00
Vadim Zeitlin
af82bc101e Mac compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 23:12:39 +00:00
Michael Wetherell
8f1158912f wxMBConv test cases, patch 1179989 from Vince Harron
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 22:29:05 +00:00
Michael Wetherell
394579cf6f Replacements for some wcsxxx funcs for systems without them like osx 10.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 22:21:20 +00:00
Vadim Zeitlin
d2a8de2f81 add missing braces to quiet gcc warnings about missing braces around initializer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 22:15:30 +00:00
Michael Wetherell
8b9e1f439b Comment typo fixes from Vince Harron
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 22:05:05 +00:00
Vadim Zeitlin
1fc0b5afe7 removed #if KEY_wxList_DEPRECATED: as KEY_wxList_DEPRECATED is not defined anywhere, this doesn't do anything but provoke gcc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 21:51:32 +00:00
Vadim Zeitlin
de1b0aeb6c removed mentions of wxUSE_OWNER_DRAWN: unless I miss something, this doesn't make any sense for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 21:49:22 +00:00
Vadim Zeitlin
2f31c6ec81 correct -Wundef warning for __MSL__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 21:46:31 +00:00
Michael Wetherell
3c28b7cbc8 Regenerate after yesterday's fix for bug 1230877.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 13:44:17 +00:00
Michael Wetherell
c7f476c90d Copy univ/setup.h instead of msw/setup.h for wxUniversal in VC++ project
files. Fixes bug 1230504.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 13:34:42 +00:00
Michael Wetherell
2edad6fc48 Add <contrib-lib> bakefile tag. Like <wx-lib> except that in VC++ '.dsw' files
it creates a dependency on a '.dsp' file under contrib instead of under lib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 13:08:45 +00:00
Michael Wetherell
460354e939 Rebake after recguard.h added to bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 12:59:33 +00:00
Mart Raudsepp
88d197753d Expand tabs, identation/whitespace fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 09:50:13 +00:00
Mart Raudsepp
86e69fa54a Expand tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 09:35:27 +00:00
Mart Raudsepp
21d23b882f [wxGTK2] wxTextCtrl::XYToPosition(): Return -1 if x or y is out of range
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 08:53:48 +00:00
Mattia Barbon
8ca58566a3 Removed wxVectorBase and wxClientDataDictionary symbols
from version-script.it as per Mike Wetherell suggestion.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 21:13:59 +00:00
Vadim Zeitlin
a8ee80604c don't use wxVERIFY, it generates gcc warnings and is not appropriate as it doesn't replace real error checking anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 21:12:50 +00:00
Michael Wetherell
8bc9a2f0b1 With Sun CC temporaries have block scope unless '-features=tmplife' is used.
Fixes bug report 1230877.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 16:48:29 +00:00
Vadim Zeitlin
daef468900 deTABified; removed unused variable provoking a gcc warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 16:06:49 +00:00
Vadim Zeitlin
f3a65c3e49 unused variable warning when !wxMAC_USE_NATIVE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 16:05:46 +00:00
Vadim Zeitlin
64f4562328 assign 0, not NULL, to an int
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 16:04:04 +00:00
Vadim Zeitlin
26dfc72818 deTABified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 16:02:56 +00:00
Vadim Zeitlin
592a746534 fix problems with __POWERPC__ being redefined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-07 15:53:22 +00:00
Vadim Zeitlin
3a0827804b set m_error correctly (patch 1249848)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 21:35:12 +00:00
Vadim Zeitlin
4a712ba3cf fix wxGetMessageName() in Unicode build (patch 1250662)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 21:30:24 +00:00
Vadim Zeitlin
b1638abf1e recognize 0/1 as false/true in string->bool conversion (patch 1249632)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 21:16:55 +00:00
Vadim Zeitlin
a7c476dc94 generate MD5SUM files for nightly builds (patch 1252331)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 21:14:02 +00:00
Michael Wetherell
b900c52285 Add wxMGL and Cygwin changes to the changelog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 20:49:35 +00:00
Vadim Zeitlin
abc3d84166 added char/wxChar note (bug 1252854)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 19:45:36 +00:00
Vadim Zeitlin
ada974cb26 added ldconfig-not-in-path note and removed duplicate section (bug 1253089)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 19:39:54 +00:00
Vadim Zeitlin
5529f88ee3 corrected regex library name in ANSI builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 19:33:32 +00:00
Vadim Zeitlin
97d16ceba0 added wx/recguard.h (bug 1253148)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 19:30:00 +00:00
Julian Smart
4a3a0eada4 Compatibility settings corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 17:55:56 +00:00
Michael Wetherell
6afac89ea9 Additional information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 12:40:27 +00:00
Julian Smart
bc858dcfaa Restored monolithic build for eVC++ 4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 12:15:08 +00:00
Michael Wetherell
3877be2196 Notes on compiling MGL 5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 09:37:40 +00:00
Michael Wetherell
3dddebb1cd Needs to refresh the affected parts when resized but I think that would involve
breaking binary compatibilty. So for now use wxFULL_REPAINT_ON_RESIZE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 01:46:32 +00:00
Michael Wetherell
1cdab5d13a Refresh a window's non-client area when it is resized.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 01:41:18 +00:00
Vadim Zeitlin
c6dcd973a5 set best fitting size for the toolbar in Realize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 01:24:27 +00:00
Vadim Zeitlin
d36d1be926 don't crash in GetTextExtent() under Windows where print data is not a wxPostScriptPrintNativeData; use wxStandardPaths to find the location of AFM files instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 01:21:59 +00:00
Vadim Zeitlin
305561828c initialize backing store bitmap in Create(), notebook doesn't always get a size event immediately after creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-06 01:11:11 +00:00
Vadim Zeitlin
40d4efa81e added explicit wx/dynlib.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 23:16:15 +00:00
Vadim Zeitlin
0b62785c42 missing dllexport declaration added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 23:15:17 +00:00
Vadim Zeitlin
5bcb84f804 disable RTTI and exceptions by default for wxWinCE/eVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 23:13:33 +00:00
Vadim Zeitlin
f10747d890 corrected logic in wxQTMediaEvtHandler::OnEraseBackground(): only erase it if there is no movie controller and no movie
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 22:54:45 +00:00
Vadim Zeitlin
908f087155 only link with 3rd party libs if they're needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 22:39:57 +00:00
Vadim Zeitlin
7a64baad69 don't allow negative splitter position
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 22:34:24 +00:00
Vadim Zeitlin
aa200e97df use wxDynamicLibrary::GetSymbolAorW() instead of the manual mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 22:11:23 +00:00
Vadim Zeitlin
7e41b689a7 1. extracted code common to all backends in wxMediaBackendCommonBase
2. don't refresh the parent on movie load/size change unless it does use
   a sizer (i.e. made code follow the existing comment)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 22:01:48 +00:00
Vadim Zeitlin
6ab9bf57a5 fixed horrible hack with passing pointers of wrong type to Connect(), use a real event handler class as appropriate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 21:27:44 +00:00
Vadim Zeitlin
4e61bf2ca1 removed unused OnPaint() handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 20:25:26 +00:00
Vadim Zeitlin
86e3091191 don't remember size passed to SetSize() as pending position/size for TLW as deferred move is not used for them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 17:35:38 +00:00
Chris Elliott
fa776a5809 apply SF patch 1252602 to remove warnings in bcc and watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 15:23:38 +00:00
Vadim Zeitlin
4106cebb95 initialize send_event field of GdkEventExpose we generate (bug 1245864) (Robert, please review this if possible)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 11:58:13 +00:00
Vadim Zeitlin
f3cb0d85b4 compilation fix for WXWIN_COMPATIBILITY_2_2 (bug 1252476)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-05 11:48:43 +00:00
Vadim Zeitlin
9aba21ea4b corrected wxUnix2DosFilename signature, added deprecation note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:49:40 +00:00
Vadim Zeitlin
11850ff358 corrected test for __WXGTK__ (but should it be there at all?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:05:49 +00:00
Vadim Zeitlin
206391cbab corrected HAVE_NMLVFINDITEM tests, eliminated HAVE_NM_FINDITEM as it's more clear to just redefine NMLVFINDITEM in DMC case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:05:01 +00:00
Vadim Zeitlin
fe19000379 use ifdef, not if, to test for HAVE_WCSRTOMBS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:02:15 +00:00
Vadim Zeitlin
33349a2073 removed more remains of wxUSE_PENWINDOWS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:01:29 +00:00
Vadim Zeitlin
687809e95b corrected test for HAVE_FSYNC: ifdef, not if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 21:00:49 +00:00
Vadim Zeitlin
38b4a946f3 added wxUSE_DC_CACHEING
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 20:54:16 +00:00
Vadim Zeitlin
3df732cd47 removed wxUSE_MENU_CALLBACK references: the code inside the #if couldn't compile anyhow as wxFunction isn't defined in wx since quite some time now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 20:35:09 +00:00
Vadim Zeitlin
85fa5d02d8 removed (unused since quite some time) wxUSE_ITSY_BITSY
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 20:31:11 +00:00
Vadim Zeitlin
91ebae296d removed wxUSE_PENWINDOWS (and its misspellings), it didn't work and wasn't used/defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 20:28:00 +00:00
Vadim Zeitlin
16f10340da define wxUSE_MFC as 0 if it's not defined (fixes gcc -Wundef warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 20:21:49 +00:00
Mart Raudsepp
50aee613a3 [wxGTK2] wxTextCtrl: Implemented support for wxTEXT_ALIGNMENT_{LEFT,RIGHT,CENTRE} attributes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 14:57:10 +00:00
Julian Smart
550f38d743 More settings restored.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 14:51:40 +00:00
Julian Smart
7cfd4b0c53 Removed eVC++ project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 14:27:33 +00:00
Mart Raudsepp
9475f9e7e1 wxFont wxMSW specific ctor first arg is a const wxSize&, not int
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 11:31:01 +00:00
Julian Smart
e7c240da70 Switched loads of settings back on
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 10:28:19 +00:00
Julian Smart
b7972e1fa8 Resolved CVS conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 10:05:41 +00:00
Vadim Zeitlin
6ebeb4c721 added tests for fsync() and pthread_cleanup_push/pop()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 01:09:35 +00:00
Vadim Zeitlin
816a7358d3 test for wxHAVE_PTHREAD_CLEANUP with #ifdefs instead of testing for (never defined) HAVE_THREAD_CLEANUP_FUNCTIONS with #if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 01:06:36 +00:00
Vadim Zeitlin
9894cc01c9 added HAVE_FSYNC and wxHAVE_PTHREAD_CLEANUP (replacing HAVE_THREAD_CLEANUP_FUNCTIONS)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 01:06:07 +00:00
Vadim Zeitlin
52ca5b5941 define wxFsync() as fsync() under Unix not as (not existing) commit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 01:05:26 +00:00
Vadim Zeitlin
82ff64fdb7 configure defines HAVE_FSYNC, not wxHAVE_FSYNC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 01:04:17 +00:00
Vadim Zeitlin
896e226aa2 wxNEED_STRDUP was wrong tested with #if instead of #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:59:42 +00:00
Vadim Zeitlin
2a5e6376f2 check that wxUSE_DATEPICKCTRL_GENERIC is defined before checking its value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:34:03 +00:00
Vadim Zeitlin
2ff3507939 define wxUSE_IPV6 as 0 to avoid -Wundef warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:28:58 +00:00
Vadim Zeitlin
187202106f NEED_GTK_ICON_SIZE_LOOKUP was incorrectly tested using #if instead of #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:25:20 +00:00
Vadim Zeitlin
25e6c06102 due to a typo in #if condition, validation was disabled for wizard pages -- fixed now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:22:47 +00:00
Vadim Zeitlin
39de6d6ca1 define wxUSE_LINE_IN_LISTBOOK to avoid -Wundef warnings (but define it as 0 so thje line is still disabled by default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-04 00:16:43 +00:00
Vadim Zeitlin
fe856cc55b no need to check dbghelp DLL initialization in GetAssertStackTrace() explicitly any more now that wxStackWalker doesn't log an error if it failed to do it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 23:58:54 +00:00
Vadim Zeitlin
b3a6d2694c don't give error message if we failed to get the stack, this doesn't mean anything to the user
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 23:57:00 +00:00
Vadim Zeitlin
494c7caa78 define WXWIN_COMPATIBILITY_EVENT_TYPES as 0 if it's not defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 23:44:05 +00:00
Vadim Zeitlin
498919ddcd test for __MWERKS__ with #ifdef, not #if (fixes a -Wundef gcc warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 20:08:14 +00:00
Vadim Zeitlin
376a8ce2d4 get rid of wxUSE_COMPATIBLE_COORD_TYPES, it is not used nor defined anywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 20:06:28 +00:00
Michael Wetherell
2e85922c96 Fix deletes that should be delete[]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 19:25:52 +00:00
Michael Wetherell
2113bc7764 Rebake after MSLU and other changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 16:10:12 +00:00
Mart Raudsepp
94709f1911 Document wxTextCtrl::XYToPosition, PositionToXY and GetLineLength change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 13:40:13 +00:00
Michael Wetherell
45a74fec3f Set PLATFORM_UNIX for the rpmspec format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 13:36:07 +00:00
Mart Raudsepp
f29a481a66 [wxGTK2] multiline wxTextCtrl: Implement XYToPosition, PositionToXY and GetLineLength natively, making them not take
an eternity per call. Also closes bug #1250464. Not sure if this should go into changes.txt.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 13:14:36 +00:00
Michael Wetherell
cdc0140021 Revert previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 11:53:16 +00:00
Michael Wetherell
9cf620e249 Replace disjunction in <if> with two ifs since it seems to be preventing baking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 11:50:32 +00:00
Stefan Csomor
3a0ec6ebdb don't force immediate screen updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 05:13:37 +00:00
Michael Wetherell
94c7b08817 Add import/export attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-03 00:53:09 +00:00
Michael Wetherell
20123d4958 Add import/export attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-02 22:58:06 +00:00
Michael Wetherell
172df1f035 Add import/export attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-02 21:44:34 +00:00
Michael Wetherell
5b12cceef8 Expand tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-02 20:57:54 +00:00
Michael Wetherell
968eb2ef39 Add import/export macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-02 18:16:51 +00:00
Julian Smart
d98c97a36a Small corrections to licence
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-02 17:36:23 +00:00
Mart Raudsepp
b5ab6d19d3 [wxGTK] wxFileDialog: Use native overwrite confirmation if possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 16:39:57 +00:00
Michael Wetherell
6807396fdf Set default size and position for top level windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 16:38:35 +00:00
Mart Raudsepp
b3f4c57077 Mostly cosmetical preprocessor check modifications to last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 15:39:46 +00:00
Mart Raudsepp
fee7a683ed [ 1222406 ] Fix for BadMatch X errors with wxGLCanvas under wxGTK - Nathan Cournia.
Modified to not break compilation pre-gtk2.2. Older gtk+ versions than 2.2 probably still need a workaround to
the original problem (the code is identical to them than before). Alas, I've never been able to reproduce the
problem. Testing appreciated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 15:36:18 +00:00
Stefan Csomor
a85245b1c2 correcting condition: only interfere in the non-native case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 06:06:13 +00:00
Vadim Zeitlin
8927d6d11c don't crash when showing vert toolbar when horz one is not shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 01:07:28 +00:00
Vadim Zeitlin
7a7d2a14fd don't call SetSize when creating the 2nd toolbar, this just results in unnecessary flicker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 19:00:54 +00:00
Vadim Zeitlin
a7e0e432a2 account for client area origin when returning pending position from DoGetPosition()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 18:58:39 +00:00
Stefan Csomor
516d38cdfd applied patch 1216005 : message and new NavDirDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 18:32:04 +00:00
Stefan Csomor
5324268eab applied patch 1223806 : unicode for tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 17:54:58 +00:00
Stefan Csomor
8fc754bf2b mouse-capture fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 17:32:06 +00:00
Stefan Csomor
1a535eb9ee adding 'select all' semantics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 17:06:57 +00:00
Stefan Csomor
00a7bd8596 fixing names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 16:36:38 +00:00
Vadim Zeitlin
11840d1c73 regenerated after adding sound.rc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 15:42:03 +00:00
Robert Roebling
2db1b1c0be Correctly calculate ClientSize when using native
toolbars.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 13:03:47 +00:00
Mattia Barbon
996994c714 Allow displaying Japanese character with wxMotif/ANSI under a
Japanese EUC-JP locale:

- add a #define (wxMOTIF_NEW_FONT_HANDLING) defaulting to
  off
- factor the code for getting text extents in a central
  wxGetTextExtent function
- when the new font handling is enabled load a fontset instead of
  a single font. For non-Japanese locales this should load a fontset
  containing a single font.
- on a Japanese locale set the default point size to 15: the Japanese
  fonts I have are much more readable like this.
- do not set the wordwrap property for multiline wxTextCtrl with
  OpenMotif 2.1, otherwise it crashes when text is added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 09:42:16 +00:00
Stefan Csomor
328f4fee60 defaulting to small style (24x24), and correcting the cut-off decision to be at > 24 instead of >16
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 09:22:29 +00:00
Mattia Barbon
b77a938972 Use accessors for wxObject members.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 07:31:33 +00:00
Michael Wetherell
bfb8eb7eae Defer deletion of wxFontsManager and MGL_exit until after the modules have been cleaned up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 23:15:52 +00:00
Michael Wetherell
b468fab240 Disable wxDataObject for MGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 23:12:51 +00:00
Michael Wetherell
b5715bdd0b Temporary fix for missing ;;
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 23:08:40 +00:00
Stefan Neis
496959ebbd Only compile PopupWindow if corresponding define is set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 20:48:49 +00:00
Mattia Barbon
8da782ef64 Avoid crash when wxGUIAppTraits::GetToolkitInfo is called too
early.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:32:49 +00:00
Mattia Barbon
d946915c20 Return the correct encoding for X font spec construction
under Japanese locale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:26:06 +00:00
Mattia Barbon
9d02485ed9 Initialize Xt locale handling.
Set the correct default font encoding on startup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:24:32 +00:00
Mattia Barbon
b12401e0d5 Fix indentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:22:50 +00:00
Mattia Barbon
6603071a99 Make wxBase compiled for wxMotif compatible with wxbase compiled
with all the other Unix-ish ports. Thanks to Ian Brown for nagging
about this.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:17:32 +00:00
Mattia Barbon
9c8e9fb600 Add configure check for Lesstif, to be used by following
patches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:14:29 +00:00
Mattia Barbon
8d1bf3c7ff Move per display data cleanup to wxApp::CleanUp where it belongs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:11:49 +00:00
Mattia Barbon
f920436385 Align initial size handling with other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:09:56 +00:00
Mattia Barbon
c9429ecf52 Remove unused headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 17:07:18 +00:00
Vadim Zeitlin
b55c37167d moved MSW-specific stuff to wx/msw/chkconf.h, this also means that MSW-specific checks are not done for WinCE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 12:48:40 +00:00
Vadim Zeitlin
7ecb668390 define wxUSE_UNICODE_MSLU as 0 unconditionally, CE doesn't support nor need MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 12:46:11 +00:00
Julian Smart
6926b9c403 assert -> wxASSERT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 11:55:41 +00:00
Julian Smart
7bccea09a7 Define wxUSE_UNICODE_MSLU or chkconf.h complains
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 11:51:07 +00:00
Václav Slavík
e32dc37570 further wxABI_VERSION fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 10:32:12 +00:00
Vadim Zeitlin
2bb0622079 wxUSE_UNICODE_MSLU is MSW-specific so shouldn't be in setup_inc.h: removed and regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:36:33 +00:00
Vadim Zeitlin
d74358bc41 forcefully disable wxUSE_STACKWALKER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:34:05 +00:00
Vadim Zeitlin
0818de2d5b updated the script to deal with licensing information added to wx/setup_inc.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:29:41 +00:00
Vadim Zeitlin
a649ec0158 oops, wxUSE_UNICODE_MSLU and not wxUSE_MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:22:40 +00:00
Vadim Zeitlin
22df83431d define wxUSE_MSLU=1 in compiler flags if MSLU=1 was given in the make flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:17:24 +00:00
Vadim Zeitlin
11cfa8ef8d return pending position/size if any, not the current one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:02:55 +00:00
Vadim Zeitlin
7d86a2d45c replaced wxMoveWindowDeferred() with wxWindow::DoMoveSibling()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:01:51 +00:00
Vadim Zeitlin
7a0e7e55d8 take border into account in best size calculations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 23:25:08 +00:00
Vadim Zeitlin
4fa8085100 decreased text limit which we consider to be set by user (and not built in the control) to 10001 which is less than default 30000
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 23:01:56 +00:00
Vadim Zeitlin
f3d0213e5b use ReadLine() instead of GetLine() which sometimes hangs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 22:28:02 +00:00
Vadim Zeitlin
93ed8ff770 added wxDynamicLibrary::GetSymbolAorW()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 22:27:13 +00:00
Vadim Zeitlin
b7146cbec5 compilation fix for IBM xlC (closes 1230392)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 19:44:17 +00:00
Włodzimierz Skiba
3832f94664 OW/Borland/MinGW warnings. Missing headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 19:19:31 +00:00
Włodzimierz Skiba
f5de1a0530 Fixed doubled header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 18:44:49 +00:00
Włodzimierz Skiba
fb5ab39697 Fix (workaround?) for rpmspec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 18:41:58 +00:00
Włodzimierz Skiba
3a44e4bec8 Fix (workaround?) for rpmspec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 18:36:45 +00:00
Vadim Zeitlin
4a4aafb247 xlC needs -qunique under AIX only, at least it doesn't accept it at all under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 18:21:32 +00:00
Robert Roebling
97ddaeee9e Correct wxGTK.spec again after bakefiling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 16:44:00 +00:00
Stefan Csomor
df71db0ede respect styles during creation as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 16:37:38 +00:00
Mart Raudsepp
b4d06fb78d Whitespace fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 15:58:36 +00:00
Vadim Zeitlin
81f9c57504 don't crash in Get() if there is no wxApp (closes 1236514)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 14:15:26 +00:00
Vadim Zeitlin
b1e0f4ed69 async playback and object lifetime remarks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 14:06:27 +00:00
Vadim Zeitlin
0591bcfdfa added test for playing sound from memory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:59:35 +00:00
Vadim Zeitlin
cb51c9902f added Stop test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:43:55 +00:00
Chris Elliott
e3307dddec wxMDIChildFrame::DetachMenuBar() to fix SF bug 1232271
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:41:49 +00:00
Kevin Hock
867f2ca48e Do not try to expand the root node in SetWindowStyle if the root node hasn't been created yet [ bug 1247413 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:20:17 +00:00
Vadim Zeitlin
ddc5c471d4 refactoring in preparation for further changes: moved data in a private struct, let Windows load resources instead of doing it ourselves, use GlobalPtr[Lock] classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:19:32 +00:00
Vadim Zeitlin
247ec3f4cc fixed id values to be more standard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 12:48:06 +00:00
Vadim Zeitlin
172f04f5bb added http://www.wxwidgets.org/bincompat.html link
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 12:47:02 +00:00
Vadim Zeitlin
941821d8ac added test for playing Windows resources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 12:35:10 +00:00
Vadim Zeitlin
2be57a5131 added GlobalPtr: GlobalAlloc/Free() wrapper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 12:18:17 +00:00
Chris Elliott
c9e4ece63a fix for VC (also ok with Borland and DMC)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 11:32:27 +00:00
Vadim Zeitlin
0645e2b90a renamed GlobalPtr to GlobalPtrLock
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 11:17:28 +00:00
Mart Raudsepp
0cc970b3db Use *wxTopLevelWindowGTK*RequestUserAttention*; because *int* isn't the case always in the name mangling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 10:10:42 +00:00
Mart Raudsepp
4a446b03dc wxABI_VERSION guard for wxTopLevelWindowGTK::RequestUserAttention(int)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 10:03:56 +00:00
Mart Raudsepp
32485259c1 Add *wxTopLevelWindowGTK*RequestUserAttention*int*;
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 09:56:25 +00:00
Kevin Hock
c6732f7f2f Fixed label positions for horizontal slider [ modified patch 1102150 ], fixed value label position for vertical slider, added logic in constructor for choosing vertical or horizontal based on LEFT/RIGHT/TOP/BOTTOM etc. copied from MSW; without this, the widgets sample slider tab can't show the vertical slider because using LEFT or RIGHT doesn't cause the slider to go vertical.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 05:19:50 +00:00
Stefan Csomor
56d74412d9 added intl.h for contextmenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 04:45:17 +00:00
Mart Raudsepp
6925aa36f2 slight CPP logic fix in my wxTLW::RequestUserAttention code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 00:13:34 +00:00
Vadim Zeitlin
c5191fbd2b many improvements/bug fixes to media control: new wxEVT_MEDIA_LOADED event, new methods taking URIs, new DirectShow implementation, significant sample improvements (patch 1233613)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 23:56:57 +00:00
Mart Raudsepp
dca92ddfbf wxGTK: Implemented wxTLW::RequestUserAttention()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 23:32:42 +00:00
Vadim Zeitlin
e9333003ea missing dll decl stuff and members initialization in ctor (patch 1211900)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 23:23:27 +00:00
Vadim Zeitlin
86110e1a19 clarifications about MRU menu workings (patch 1221797)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 23:09:26 +00:00
Vadim Zeitlin
73bb565476 don't reserve space in the header for the column image if there is none (patch 1225522)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 23:01:36 +00:00
Vadim Zeitlin
978d3d3647 added wxImage::RotateHue() and RGB <-> HSV conversions (patch 1227108)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:50:34 +00:00
Vadim Zeitlin
278d457684 mention VC8 support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:28:32 +00:00
Vadim Zeitlin
25a116143a don't include shlwapi.h as it might be not available (modified patch 1228033)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:27:43 +00:00
Vadim Zeitlin
fb6efdf277 Ctrl+mouse wheel changes zoom factor in print preview (patch 1230919)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:20:06 +00:00
Vadim Zeitlin
62f864c32c removed USE_SHARED_LIBRARY mentions (and all variations in spelling) (patch 1231184)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:08:31 +00:00
Vadim Zeitlin
3b2931fbf5 ShowFullScreen() shows the window if it was still hidden (modified patch 1231514)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 22:03:40 +00:00
Vadim Zeitlin
97d8fe8791 moved wxURL::ConvertToValidURI() and other methods from uri.cpp to url.cpp so that they're exported from net DLL as needed (patch 1233765)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:52:50 +00:00
Vadim Zeitlin
6984e41478 fix for wxLongLong division test (patch 1233771)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:49:26 +00:00
Vadim Zeitlin
93c96bab3d corrected event type for standalone scrollbars (patch 1240385)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:38:46 +00:00
Vadim Zeitlin
2b3c87952d document wxDb::ExecSql() 3 params overload (patch 1240839)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:28:05 +00:00
Vadim Zeitlin
e6d67b57dd Ryan's binary compatibility technote (patch 1242898)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:25:00 +00:00
Vadim Zeitlin
b7d5066c30 added wxABI_VERSION check around newly added function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:23:50 +00:00
Vadim Zeitlin
fbd3c46d32 don't log error if connection has been already terminated in HangUp() (patch 1243184)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:15:53 +00:00
Vadim Zeitlin
c5c4070f88 typo (patch 1246614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:02:18 +00:00
Vadim Zeitlin
f60b1d829d added wxZipFSHandler::Cleanup() (modified patch 1213615)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 21:00:46 +00:00
Michael Wetherell
083508af51 Baked again without '-b wx.bkl' to fully update autoconf_inc.m4 and regenerated configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 18:45:54 +00:00
Michael Wetherell
c946965956 Regenerate using autoconf/bakefile.m4 from bakefile CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 17:48:31 +00:00
Michael Wetherell
810b94f0aa Rebaked with patched bakefile 0.1.9.1, ran aclocal and autoconf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 16:16:35 +00:00
Julian Smart
8e045ec6f5 Corrected DSW files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 14:52:30 +00:00
Vadim Zeitlin
da98e15760 disabled wxStackWalker and wxCrashReport for Win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 14:02:55 +00:00
Stefan Csomor
3803c372a1 lowercase bools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 13:43:49 +00:00
Stefan Csomor
5d0bf05abe code formattings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 13:32:20 +00:00
Julian Smart
eb730a0ca9 Regenerated configure for 2.6.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 13:18:09 +00:00
Julian Smart
0d90d6ea7a Rebake for 2.6.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 12:48:14 +00:00
Włodzimierz Skiba
3285ee538b Defaults in wxWinCE documented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 20:01:02 +00:00
Stefan Csomor
c962017556 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 18:16:27 +00:00
Stefan Csomor
db12374b74 new native toolbar implementation (turned off by default, not supporting embedded controls yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 15:02:04 +00:00
Stefan Csomor
e56d25204f new native toolbar implementation (turned off by default, not supporting embedded controls yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 14:53:12 +00:00
Chris Elliott
77380b5cba fix SF bug 1236365 (tested in VC only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 08:49:08 +00:00
Vadim Zeitlin
a8f84bcded moved declaration of variable only used if wxUSE_GIF inside #if wxUSE_GIF block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 23:33:27 +00:00
Vadim Zeitlin
f5d7ba7593 removed (non existing) default argument for DrawRoundedRectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 21:05:58 +00:00
Kevin Hock
8a46ca8568 Updating wording in description of Skip to be less ambiguous between the default behavior of the event processing and the default parameter of Skip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 18:58:25 +00:00
Włodzimierz Skiba
5fb9aa5673 Better 'missing WXUNUSED' workaround (perhaps unnecessary if nomore standalone option possible).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 15:38:55 +00:00
Michael Wetherell
29c326b745 Support comma separated list in G_FILENAME_ENCODING
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 14:16:29 +00:00
Włodzimierz Skiba
c40158e40b Corrections for future OW 1.4. Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 09:05:27 +00:00
Włodzimierz Skiba
e4592d6028 Header correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-26 07:54:36 +00:00
Vadim Zeitlin
90cf46d9cf disabled clipboard and dnd if dataobj is disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 22:44:01 +00:00
Mart Raudsepp
14631f7fa5 #if wxUSE_DATAOBJ guard src/gtk/dataobj.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 19:40:46 +00:00
Julian Smart
f02fe2efc8 Version number update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 16:35:16 +00:00
Stefan Csomor
3c393c0a56 new capture handling, can be turned off
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 14:27:56 +00:00
Stefan Csomor
24eef5846c Adding David Surovell's fixes and extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 06:18:04 +00:00
Włodzimierz Skiba
3ef9a46f7d Typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 06:14:55 +00:00
Stefan Csomor
03e4ffc38e Adding David Surovell's fixes and extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-25 06:09:18 +00:00
Vadim Zeitlin
9c43d88f6d corrected misleading comment about DllGetVersion()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 18:23:32 +00:00
Stefan Csomor
fff52b1902 Using Carbon Calls for getting highlight color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 13:47:16 +00:00
Stefan Csomor
768c6e8be2 OSX two-level header fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 13:36:31 +00:00
Stefan Csomor
40ba2f3bcd OSX two-level header fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 13:28:52 +00:00
Robert Roebling
37b2afb258 Unicode is not the default.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 11:15:57 +00:00
Michael Wetherell
35c2acd4a8 Add wxListCtrl::Get/SetItemFont, patch 1236820 Francesco Montorsi
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 22:29:20 +00:00
Michael Wetherell
6900d12d69 Add wxABI_VERSION wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 20:21:14 +00:00
Michael Wetherell
82c5bc84b8 Add *wxShadowObject*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 20:17:03 +00:00
Włodzimierz Skiba
3dee36ae33 [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 18:08:18 +00:00
Włodzimierz Skiba
0a164d4c4e [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 18:01:46 +00:00
Włodzimierz Skiba
bfd84575a2 [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:56:31 +00:00
Włodzimierz Skiba
92218ce600 [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:13:46 +00:00
Włodzimierz Skiba
7448de8d8d [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:08:42 +00:00
Włodzimierz Skiba
66e9a9f0ae [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 16:56:26 +00:00
Mart Raudsepp
0423ae974b Add wxCLOSE_BOX to wxFL samples (consider using wxDEFAULT_FRAME_STYLE).
Whitespace/typo fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 16:43:04 +00:00
Włodzimierz Skiba
b63269cabe Re-adding setup0.h for OpenWatcom makefile build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 13:31:06 +00:00
Włodzimierz Skiba
38a4ddd52d wxOS2 with Open Watcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 13:07:32 +00:00
Włodzimierz Skiba
77f4f0a700 Updated info about missing parts in OW headers (now reported and fixed for incoming OW 1.4) and further source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 12:57:02 +00:00
Włodzimierz Skiba
8cc3b2e982 [1242443] wxUSE_UNICODE fix for wxLaunchDefaultBrowser.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 12:51:12 +00:00
Włodzimierz Skiba
52abdc8300 LIBDIRNAME unique between ports buildable with Open Watcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 12:44:44 +00:00
Włodzimierz Skiba
7121be53c7 eVC3 compatibility workaround.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:44:06 +00:00
Włodzimierz Skiba
8ce8835c06 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:38:58 +00:00
Włodzimierz Skiba
1dba7b4c69 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:30:41 +00:00
Włodzimierz Skiba
7e1e696511 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:18:43 +00:00
Włodzimierz Skiba
0872eaf957 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:08:28 +00:00
Włodzimierz Skiba
6670f56440 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:00:07 +00:00
Włodzimierz Skiba
7a893a3152 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 16:22:28 +00:00
Vadim Zeitlin
48962b9fdd reverted last change with setting the focus only if we hadn't had it, this breaks under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 10:19:53 +00:00
Vadim Zeitlin
4686e0f659 added mouse wheel event test; don't trap left mouse clicks in MyCanvas as this makes it impossible to give focus to the window and so to use mouse wheel in it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 10:16:57 +00:00
Vadim Zeitlin
3c29734862 position of wxEVT_MOUSEWHEEL events is now in client, not screen, coordinates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 10:14:36 +00:00
Vadim Zeitlin
b0c4316ebd check the validity of wxString pointer itself too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 18:32:57 +00:00
Vadim Zeitlin
e1f2de5ab3 check that wxString is valid before dumping it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 15:32:07 +00:00
Vadim Zeitlin
b903802e08 fixed assert when dumping a string which is locked for writing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 14:39:29 +00:00
Vadim Zeitlin
14ddc4d7eb update from Liou Xiao (accelerator key format changed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 13:41:48 +00:00
Vadim Zeitlin
2bb3c0c0dd take the address of the member in wxON_BLOCK_EXIT_OBJ macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 13:30:28 +00:00
Vadim Zeitlin
3c58949394 regenerated to include scope guard test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 13:29:15 +00:00
Vadim Zeitlin
94a5c401ac tooltips work under Mac as well; no need for wxUSE_TOOLTIP (especially spellt incorrectly)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-20 10:23:05 +00:00
Julian Smart
228146b082 Make sure text part of combobox is enabled/disabled too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-19 19:55:03 +00:00
Włodzimierz Skiba
056e68bb42 Updated info after recent PODS 1.2 release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-19 19:08:59 +00:00
Kevin Hock
873aefb8b9 QueryValue should use Open(Read) rather than Open [ Bug 1240345 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 17:52:23 +00:00
Włodzimierz Skiba
32c0c61cbd Missing wxUSE_* markup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 16:58:18 +00:00
David Webster
13aca5dd5d Add upwards recursion to UpdateAccel method.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 15:27:31 +00:00
Julian Smart
fde0548028 Patch from Andre Reitz to correct a couple of bugs
1. Error when fetching papersize from dev-mode
   somebody changed
        if {...} else if {...} else {...}
   to:  ............. if {...} else {...}

2. Error when getting bin from devmode:
   - no translation to wxPRINTBIN_... constants when getting from devMode->dmDefaultSource
   - but: translation when setting to devMode->dmDefaultSource


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 14:39:54 +00:00
Włodzimierz Skiba
822fc19ef0 wxScopeGuard adjustements for Open Watcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 13:46:29 +00:00
Włodzimierz Skiba
78a054f667 Code simplification and warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 13:43:42 +00:00
Włodzimierz Skiba
0a13502d18 Comment correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 13:39:55 +00:00
Włodzimierz Skiba
b4626104e5 wxMSWUniv build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 13:36:31 +00:00
Michael Wetherell
c447205527 wxABI_VERSION >= 20601 for wxLaunchDefaultBrowser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 11:17:03 +00:00
Michael Wetherell
0f8218d7ca Add wxABI_VERSION > 20601 wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 13:00:11 +00:00
Michael Wetherell
121aea4614 Add test that wxABI_VERSION is not set when compiling the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 12:55:45 +00:00
Michael Wetherell
8df1373abc Add wxXmlResource changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 12:54:37 +00:00
Michael Wetherell
45a9a13763 Make wxABI_VERSION default be e.g. 20699
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 12:50:29 +00:00
Kevin Hock
99b62b5ffc Consider native data format, zero out buffer before use in case it doesn't get filled [ patch 1237326 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 03:21:46 +00:00
Kevin Hock
e0a3672027 Added null checks to wxTextObjectData::GetDataHere and GetDataSize [ patch 1237326 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-17 03:15:50 +00:00
Vadim Zeitlin
28ea89b62b handle '&' in the names of the files in the history correctly by quoting it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 23:10:46 +00:00
Vadim Zeitlin
7ae74029b8 put GetEscapeId() inside #if wxABI_VERSION > 20601
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 22:52:34 +00:00
Vadim Zeitlin
10b9be3230 fixed a rare crash due to malformed HTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 22:38:46 +00:00
Vadim Zeitlin
99f0dc6887 fixed handling of the accelerators of menu items added to already attached submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 22:29:47 +00:00
Václav Slavík
62d5b1ceb7 removed 2.6.1 symbols from 2.6.2 tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 21:39:51 +00:00
Michael Wetherell
36b6059076 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 12:28:08 +00:00
Michael Wetherell
e304942c65 Set wxABI_VERSION default value to e.g. 29999 so that new APIs can be wrapped
in before the version number is bumped in cvs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 12:12:30 +00:00
Robert Roebling
c05cc2c727 Apply patch for querying tooltip colours.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 06:59:57 +00:00
Robert Roebling
c4e8770615 Applied GTK clipboard end of string patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 06:46:32 +00:00
Vadim Zeitlin
a3dc1da946 check whether there is a critical window and don't process events then (this is needed as sometimes window proc is called directly without passing by wxEventLoop)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 23:01:05 +00:00
Vadim Zeitlin
c707a0d410 use wxEventLoop::SetCriticalWindow() to ensure that we don't get more crashes in the event handlers while the preview dialog is shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 22:59:50 +00:00
Vadim Zeitlin
a7b7500c4f added SetCriticalWindow() and AllowProcessing(): this allows to freeze all events except those for the specified window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 22:57:49 +00:00
Vadim Zeitlin
a393585a1e added a test of a crash inside wxEVT_PAINT handler (this is a problem as it happens multiple times...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 22:54:51 +00:00
Vadim Zeitlin
874c5c9521 rewrote sample to have a more conventional structure (in preparation for further changes...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 21:05:48 +00:00
Włodzimierz Skiba
b3eb133b51 Possibility of modeless wxWizard dialog (with presentation in sample).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 16:26:11 +00:00
Włodzimierz Skiba
95e92d9049 Missing header after recent changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-15 14:50:52 +00:00
9409 changed files with 80 additions and 4346107 deletions

View File

@@ -1,78 +0,0 @@
system.list
bin
.gdb_history
Test
config.cache
configarg.cache
config.status
system.list
linux.system.cache
wx-config
config.log
linux-gnu.system.cache
*.dsp
*.dsw
*.plg
*.opt
*.aps
*.ncb
*.pro
*.opt
*.d
*.swp
*.swo
*.vcp
*.vcw
Release
Debug
ReleaseUnicode
DebugUnicode
ReleaseUnicodeARM
DebugUnicodeARM
ReleaseUnicodeMIPS
DebugUnicodeMIPS
ReleaseUnicodeSH3
DebugUnicodeSH3
ReleaseUnicodeX86
DebugUnicodeX86
ReleaseUnicodeX86EM
DebugUnicodeX86EM
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
DebugUnicodeDLL
UnivRelease
UnivDebug
BaseRelease
BaseDebug
BaseReleaseDLL
BaseDebugDLL
build-debug
robert
stamp-h.in
Makefile
setup.h
stamp-h
libtool
base
gtk
gtk2
motif
win32
x11
univ
univ-debug
univ-release
base-debug
gtk-debug
motif-debug
win32-debug
base-release
gtk-release
motif-release
win32-release
*tags
log
univtags.cmd
.DS_Store
autom4te.cache

View File

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

25278
Makefile.in

File diff suppressed because it is too large Load Diff

View File

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

3066
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

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

80
build/aclocal/cppunit.m4 Normal file
View File

@@ -0,0 +1,80 @@
dnl
dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl
AC_DEFUN(AM_PATH_CPPUNIT,
[
AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
cppunit_config_prefix="$withval", cppunit_config_prefix="")
AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
if test x$cppunit_config_exec_prefix != x ; then
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
fi
fi
if test x$cppunit_config_prefix != x ; then
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
fi
fi
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
cppunit_version_min=$1
AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
no_cppunit=""
if test "$CPPUNIT_CONFIG" = "no" ; then
no_cppunit=yes
else
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
cppunit_version=`$CPPUNIT_CONFIG --version`
cppunit_major_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_major_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_version_proper=`expr \
$cppunit_major_version \> $cppunit_major_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \> $cppunit_minor_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \= $cppunit_minor_min \& \
$cppunit_micro_version \>= $cppunit_micro_min `
if test "$cppunit_version_proper" = "1" ; then
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
else
AC_MSG_RESULT(no)
no_cppunit=yes
fi
fi
if test "x$no_cppunit" = x ; then
ifelse([$2], , :, [$2])
else
CPPUNIT_CFLAGS=""
CPPUNIT_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
])

View File

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

View File

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

View File

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

View File

@@ -1,56 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Generate build.cfg file on Windows, with settings used to build
the library.
-->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg
</set>
<action id="build_cfg_file">
<is-phony>1</is-phony>
<dependency-of>all</dependency-of>
<depends>libdir_setup</depends>
<command>
@echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=$(WXVER_RELEASE) >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
@echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
@echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
@echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
@echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
@echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
@echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
@echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
@echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(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,655 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<requires version="0.1.7"/>
<!-- 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'">$(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_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
<!-- =============================================================== -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">
<if cond="FORMAT!='cbuilderx'">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
<set var="LIBTYPE_SUFFIX" make_var="1">
<if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
<if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
</set>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(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>
<!-- 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>
<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>
</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">
<!-- FIXME: remove this once we require >=bkl-0.1.9 -->
<if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
<msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
<if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
<msvc-project-files>
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</if>
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="FORMAT=='msevc4prj'">
<msvc-headers>wx/msw/wince/setup.h</msvc-headers>
<set var="vc_setup_h">wince\setup.h</set>
<set var="vc_setup_h_rule">wince_setup_h</set>
</if>
<if cond="FORMAT!='msevc4prj'">
<msvc-headers>wx/msw/setup.h</msvc-headers>
<set var="vc_setup_h">setup.h</set>
<set var="vc_setup_h_rule">setup_h</set>
</if>
<if cond="IS_MSVC_PRJ">
<set var="_custom_build_files" append="1">
include\wx\msw\$(vc_setup_h)
</set>
<set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\$(vc_setup_h)
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
</if>
</define-tag>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
</template>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
<!-- =============================================================== -->
<!-- 3rd party libraries: -->
<include file="regex.bkl"/>
<include file="zlib.bkl"/>
<include file="png.bkl"/>
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWidgets libs: -->
<!-- =============================================================== -->
<!-- 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>
<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>
<!-- this include is added by configure, we need to put other
includes before it: -->
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<warnings>max</warnings>
<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_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="FORMAT=='msevc4prj'">
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>commctrl</sys-lib>
<sys-lib>winsock</sys-lib>
<sys-lib>wininet</sys-lib>
</if>
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>comdlg32</sys-lib>
<sys-lib>winspool</sys-lib>
<sys-lib>winmm</sys-lib>
<sys-lib>shell32</sys-lib>
<sys-lib>comctl32</sys-lib>
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
<sys-lib>odbc32</sys-lib>
</if>
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
<ldlibs>$(EXTRALIBS_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','WINCE']">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/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>
<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: -->
<if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
<res-include cond="FORMAT=='autoconf'">
$(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'">
<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,38 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="not isdefined('file_common_samples_included')">
<include file="common.bkl"/>
</if>
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
<!-- =============================================================== -->
<template id="wx_contrib_lib" template="wx_lib_b">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<if cond="isdefined('file_common_samples_included')">
<template id="wx_contrib_sample" template="wx_sample">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_util" template="wx_util">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
</if>
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
</template>
</makefile>

View File

@@ -1,122 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWidgets samples: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<set var="MACOSX_RESOURCES">
<if cond="TOOLKIT=='MAC'">
Carbon.r sample.r
</if>
</set>
</if>
<set var="DLLFLAG">
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_util_b" template="wx">
<include>$(SRCDIR)</include>
<define>$(DLLFLAG)</define>
</template>
<template id="wx_util" template="wx_util_b">
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
<!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
<!-- this include is not added via <include> for autoconf, see
common.bkl: -->
<res-include cond="FORMAT=='autoconf'">
$(TOP_SRCDIR)include
</res-include>
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
<if cond="FORMAT=='autoconf'">
<wx-os2-lib-resource/>
</if>
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
<if cond="FORMAT!='autoconf'">
<define>NOPCH</define>
</if>
</template>
<template id="wx_util_console" template="wx_util_b">
<app-type>console</app-type>
<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,409 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="BUILDING_LIB" overwrite="0">0</set>
<option name="SHARED">
<values>0,1</values>
<values-description>,DLL</values-description>
<default-value>0</default-value>
<description>
What type of library to build?
</description>
</option>
<option name="WXUNIV">
<values>0,1</values>
<values-description>,Universal</values-description>
<default-value>0</default-value>
<description>
Build wxUniversal instead of native port?
</description>
</option>
<option name="UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWidgets?
</description>
</option>
<if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
<option name="MSLU">
<values>0,1</values>
<default-value>0</default-value>
<description>
Use MSLU library when building Unicode version.
</description>
</option>
</if>
<if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
<set var="MSLU">0</set>
</if>
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
<default-value>debug</default-value>
<description>
Type of compiled binaries
</description>
</option>
<!-- 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_XRC">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxXRC library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_OPENGL">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build OpenGL canvas library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_ODBC">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build ODBC database classes (USE_GUI must be 1)?
</description>
</option>
<option name="USE_QA">
<values>0,1</values>
<default-value>0</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>
<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>
</if>
<!-- ================================================================== -->
<!-- windows compilers -->
<!-- ================================================================== -->
<if cond="FORMAT!='autoconf'">
<option name="RUNTIME_LIBS">
<values>dynamic,static</values>
<default-value>dynamic</default-value>
<description>
Version of C runtime library to use. You can change this to
static if SHARED=0, but it is highly recommended to not do
it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0">
<if cond="FORMAT!='msevc4prj'">MSW</if>
<if cond="FORMAT=='msevc4prj'">WINCE</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
<set var="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_HTML">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>
<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! -->
</if>
</makefile>

View File

@@ -1,40 +0,0 @@
<?xml version="1.0" ?>
<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>
<cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
<sources>
src/expat/lib/xmlparse.c
src/expat/lib/xmlrole.c
src/expat/lib/xmltok.c
</sources>
</lib>
</makefile>

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,79 +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>
<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>

File diff suppressed because it is too large Load Diff

View File

@@ -1,39 +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)
</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll>
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
</makefile>

View File

@@ -1,266 +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_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_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>
</makefile>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,53 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">
<!-- NB: regex lib doesn't compile on WinCE -->
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<libname cond="FORMAT=='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</libname>
<libname cond="FORMAT!='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
</libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<define>__WX$(TOOLKIT)__</define>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
<cflags-dmars>-w12</cflags-dmars>
<sources>
src/regex/regcomp.c
src/regex/regexec.c
src/regex/regerror.c
src/regex/regfree.c
</sources>
</lib>
</makefile>

View File

@@ -1,83 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBTIFF"/>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBTIFF">
<!-- NB: libtiff doesn't compile on WinCE -->
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
</set>
<set var="TIFF_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
<if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
<if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
</set>
<lib id="wxtiff" template="3rdparty_lib"
cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include>$(INC_ZLIB)</include>
<include>$(INC_JPEG)</include>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<cflags-dmars>-w2</cflags-dmars>
<sources>
$(TIFF_PLATFORM_SRC)
src/tiff/tif_aux.c
src/tiff/tif_close.c
src/tiff/tif_codec.c
src/tiff/tif_color.c
src/tiff/tif_compress.c
src/tiff/tif_dir.c
src/tiff/tif_dirinfo.c
src/tiff/tif_dirread.c
src/tiff/tif_dirwrite.c
src/tiff/tif_dumpmode.c
src/tiff/tif_error.c
src/tiff/tif_extension.c
src/tiff/tif_fax3.c
src/tiff/tif_fax3sm.c
src/tiff/tif_getimage.c
src/tiff/tif_jpeg.c
src/tiff/tif_flush.c
src/tiff/tif_lzw.c
src/tiff/tif_luv.c
src/tiff/tif_next.c
src/tiff/tif_open.c
src/tiff/tif_packbits.c
src/tiff/tif_pixarlog.c
src/tiff/tif_predict.c
src/tiff/tif_print.c
src/tiff/tif_read.c
src/tiff/tif_swab.c
src/tiff/tif_strip.c
src/tiff/tif_thunder.c
src/tiff/tif_tile.c
src/tiff/tif_version.c
src/tiff/tif_warning.c
src/tiff/tif_write.c
src/tiff/tif_zip.c
</sources>
</lib>
</makefile>

View File

@@ -1,91 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================== -->
<!-- Handling of binary compatiblity: -->
<!-- ================================================================== -->
<!--
We use libtool CURRENT:REVISION:AGE versioning scheme. Quoting libtool
documentation on how to handle the values:
1. Start with version information of `0:0:0' for each libtool library.
2. Update the version information only immediately before a public
release of your software. More frequent updates are unnecessary,
and only guarantee that the current interface number gets larger
faster.
3. If the library source code has changed at all since the last
update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
4. If any interfaces have been added, removed, or changed since the
last update, increment CURRENT, and set REVISION to 0.
5. If any interfaces have been added since the last public release,
then increment AGE.
6. If any interfaces have been removed since the last public release,
then set AGE to 0.
-->
<set var="WX_CURRENT">2</set>
<set var="WX_REVISION">0</set>
<set var="WX_AGE">2</set>
<!-- ================================================================== -->
<!-- Library version number: -->
<!-- ================================================================== -->
<!-- extract wx version number from wx/version.h: -->
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
<!-- ================================================================== -->
<!-- Derived variables: -->
<!-- ================================================================== -->
<!-- set misc helper variables: -->
<set var="WX_RELEASE" make_var="1">
$(WXVER_MAJOR).$(WXVER_MINOR)
</set>
<set var="WX_RELEASE_NODOT" make_var="1">
$(WXVER_MAJOR)$(WXVER_MINOR)
</set>
<set var="WX_VERSION" make_var="1">
$(WX_RELEASE).$(WXVER_RELEASE)
</set>
<set var="WX_VERSION_NODOT" make_var="1">
$(WX_RELEASE_NODOT)$(WXVER_RELEASE)
</set>
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
<!-- in unstable branch, binary compat. changes with every release, check
for it: -->
<if cond="WX_STABLE_BRANCH=='0' and int(WX_CURRENT)!=int(WXVER_RELEASE)">
<error>Forgot to update WX_CURRENT/WX_REVISION/WX_AGE?</error>
</if>
<set var="WXSOVERSION">
$(int(WX_CURRENT)-int(WX_AGE)).$(WX_AGE).$(WX_REVISION)
</set>
<!-- FIXME: until libtool scheme is implemented in bakefile -->
<set var="WXMACVERSION_CMD">
<if cond="PLATFORM_MACOSX=='1'">
-compatibility_version $(WX_AGE).0 -current_version $(WX_AGE).$(WX_REVISION)
</if>
</set>
<set var="WXWIN32DLLVERSION">
<if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
</set>
</makefile>

View File

@@ -1,215 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!-- Master bakefile for wxWidgets -->
<makefile>
<!-- make sure setup.h is created as soon as possible: -->
<phony id="setup_h" cond="FORMAT!='autoconf'">
<dependency-of>all</dependency-of>
</phony>
<set var="BUILDING_LIB">1</set>
<!-- common rules, names etc. for wx: -->
<include file="common.bkl"/>
<!-- list of files sorted into categories: -->
<include file="files.bkl"/>
<!-- wxWidgets variant where everything is in one library: -->
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
<if cond="FORMAT in ['msvc6prj','msevc4prj']">
<set var="MSVC6PRJ_MERGED_TARGETS">
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
</set>
</if>
<!-- OpenGL canvas is built as separate library in both cases: -->
<include file="opengl.bkl"/>
<!-- Dynamically loadable plugins: -->
<include file="plugins.bkl"/>
<!-- Samples target (not dependency of 'all'): -->
<subproject id="samples">
<installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir>
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
</subproject>
<if cond="FORMAT=='autoconf'">
<!-- WXRC compiler is built by default: -->
<!-- FIXME: this is dirty hack, better bakefile support for
conditional and optional subprojects is needed -->
<action id="wxrc" cond="USE_XRC=='1'">
<dependency-of>all</dependency-of>
<!-- some of these are not built in all configurations, <depends>
takes care of ignoring the disabled ones: -->
<depends>monodll</depends>
<depends>monolib</depends>
<depends>basedll</depends>
<depends>baselib</depends>
<depends>xmldll</depends>
<depends>xmllib</depends>
<command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
</command>
</action>
<action id="clean-wxrc" cond="USE_XRC=='1'">
<dependency-of>clean</dependency-of>
<command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
</command>
</action>
<action id="install-wxrc" cond="USE_XRC=='1'">
<dependency-of>install</dependency-of>
<depends>wxrc</depends>
<command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
</command>
</action>
<!-- "make install": -->
<data-files>
<files>wxwin.m4</files>
<install-to>$(DATADIR)/aclocal</install-to>
</data-files>
<action id="install-wxconfig">
<dependency-of>install</dependency-of>
<command>
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
</command>
</action>
<data-files>
<srcdir>$(BUILDDIR)</srcdir>
<files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
<install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
</data-files>
<headers>
<srcdir>$(SRCDIR)/include</srcdir>
<files>$(ALL_HEADERS)</files>
<install-to>
$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
</install-to>
</headers>
<!-- Locales: -->
<using module="gettext"/>
<gettext-catalogs id="locale">
<srcdir>$(SRCDIR)/locale</srcdir>
<catalog-name>wxstd</catalog-name>
<linguas>
ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
zh zh_CN zh_TW
</linguas>
<install-to>$(LOCALEDIR)</install-to>
</gettext-catalogs>
<!-- Mac OS X resources: -->
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
<set var="MACOS_RSRC">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc</set>
<action id="cocoa-res" cond="TOOLKIT=='COCOA'">
<dependency-of>all</dependency-of>
<set var="__targetname">$(MACOS_R)</set>
<command>
$(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
</command>
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
</action>
<action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
<dependency-of>install</dependency-of>
<depends>cocoa-res</depends>
<command>
$(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
$(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
</command>
</action>
</if>
<!-- copy setup.h on DOS/Windows: -->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir>
</mkdir>
<mkdir id="libdir_setup">
<depends>libdir</depends>
<dir>$(SETUPHDIR)</dir>
</mkdir>
<mkdir id="libdir_setup_wx">
<depends>libdir_setup</depends>
<dependency-of>setup_h</dependency-of>
<dir>$(SETUPHDIR)/wx</dir>
</mkdir>
<set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if>
<if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
<dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
<dependency-of>setup_h</dependency-of>
</copy-file-to-file-if-not-exist>
<copy-file-to-file-if-not-exist id="setup.h">
<dependency-of>setup_h</dependency-of>
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
<dst>$(SETUPHDIR)/wx/setup.h</dst>
</copy-file-to-file-if-not-exist>
</if>
<if cond="FORMAT=='autoconf'">
<!-- Show this banner after installation: -->
<modify-target target="install">
<command>
@echo " "
@echo " ------------------------------------------------------"
@echo " "
@echo " The installation of wxWidgets is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@echo " if you installed a shared library and also modify the"
@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
@echo " "
@echo " wxWidgets comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
@echo " Read the wxWidgets Licence on licencing conditions."
@echo " "
@echo " ------------------------------------------------------"
@echo " "
</command>
</modify-target>
<!-- add "make dist" target to autoconf: -->
<set var="VARS_DONT_ELIMINATE" append="1">
ALL_BASE_SOURCES WX_VERSION
</set>
<fragment format="autoconf" file="make_dist.mk"/>
</if>
<include file="build_cfg.bkl"/>
</makefile>

View File

@@ -1,267 +0,0 @@
-----------------------------------------------------------------------
Creating a Cross-Platform Build System Using Bakefile
The 10-minute, do-it-yourself wx project baking guide (with free sample recipes!)
Status: DRAFT
Author: Kevin Ollivier
Date: 2/13/04
License: wxWidgets License
-----------------------------------------------------------------------
Supporting many different platforms can be a difficult challenge. The
challenge for wxWidgets is especially great, because it supports a variety of
different compilers and development environments, including MSVC, Borland C++,
MinGW, DevCPP, GNU make/automake, among others. Maintaining such a large
number of different project files and formats can quickly become overwhelming.
To simplify the maintenance of these formats, one of the wxWidgets developers,
Vaclav Slavik, created Bakefile, a XML-based makefile wrapper that generates
all the native project files for wxWidgets. So now, even though wxWidgets
supports all these formats, wxWidgets developers need only update one file -
the Bakefile, and it handles the rest. But Bakefile isn't specific to
wxWidgets in any way - you can use Bakefile for your own projects, too. This
brief tutorial will take a look at how to do that.
Note that this tutorial assumes that you are familiar with how to build
software using one of the supported Bakefile makefile systems, that you have
some basic familiarity with how makefiles work, and that you are capable of
setting environment variables on your platform. Also note that the terms Unix
and Unix-based refers to all operating systems that share a Unix heritage,
including FreeBSD, Linux, Mac OS X, and various other operating systems.
-- Getting Started --
First, you'll need to install Bakefile. You can always find the latest version
for download online at http://bakefile.sf.net. A binary installer is provided
for Windows users, while users of Unix-based operating systems (OS) will need
to unpack the tarball and run configure && make && make install. (Packages for
some distros are also available, check http://bakefile.sf.net for details.)
-- Setting Up Your wx Build Environment --
Before you can build wxWidgets software using Bakefile or any other build
system, you need to make sure that wxWidgets is built and that wxWidgets
projects can find the wxWidgets includes and library files. wxWidgets build
instructions can be found by going to the docs subfolder, then looking for the
subfolder that corresponds to your platform (i.e. msw, gtk, mac) and reading
"install.txt" there. Once you've done that, here are some extra steps you
should take to make sure your Bakefile projects work with wxWidgets:
On Windows
----------
Once you've built wxWidgets, you should create an environment variable named
WXWIN and set it to the home folder of your wxWidgets source tree. (If you use
the command line to build, you can also set or override WXWIN at build time by
passing it in as an option to your makefile.)
On Unix
-------
In a standard install, you need not do anything so long as wx-config is on
your PATH. wx-config is all you need. (See the section of the book on using
wx-config for more information.)
-- A Sample wx Project Bakefile --
Now that everything is setup, it's time to take Bakefile for a test run. I
recommend that you use the wx sample Bakefile to get you started. It can be
found in the 'build/bakefiles/wxpresets/sample' directory in the wxWidgets
source tree. Here is the minimal.bkl Bakefile used in the sample:
minimal.bkl
-------------------------------------------------------------
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="presets/wx.bkl"/>
<exe id="minimal" template="wx">
<app-type>gui</app-type>
<debug-info>on</debug-info>
<runtime-libs>dynamic</runtime-libs>
<sources>minimal.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</exe>
</makefile>
---------------------------------------------------------------
It's a complete sample ready to be baked, so go into the directory mentioned
above and run the following command:
On Windows:
bakefile -f msvc -I.. minimal.bkl
On Unix:
bakefile -f gnu -I.. minimal.bkl
It should generate a makefile (makefile.vc or GNUmakefile, respectively) which
you can use to build the software. Just build the software using the command
"nmake -f makefile.vc" or "make -f GNUmakefile" respectively. Now let's take a
look at some of the basic Bakefile concepts that you'll need to know to move
on from here.
-- Project Types --
As mentioned earlier, Bakefile builds makefiles for many different
development environments. The -f option accepts a list of formats that you
would like to build, separated by commas. Valid values are:
autoconf GNU autoconf Makefile.in files
borland Borland C/C++ makefiles
cbuilderx C++ Builder X project files
dmars Digital Mars makefiles
dmars_smake Digital Mars makefiles for SMAKE
gnu GNU toolchain makefiles (Unix)
mingw MinGW makefiles (mingw32-make)
msevc4prj MS eMbedded Visual C++ 4 project files
msvc MS Visual C++ nmake makefiles
msvc6prj MS Visual C++ 6.0 project files
watcom OpenWatcom makefiles
TIP: autoconf Project Type
---------------------------
You may notice that in the sample folder, there is also a file called
configure.in. That file is the input for autoconf, which creates the configure
scripts that you often see when you build software from source on Unix-based
platforms. People use configure scripts because they make your Unix makefiles
more portable by automatically detecting the right libraries and commands to
use on the user's machine and OS. This is necessary because there are many
Unix-based operating systems and they all are slightly different in various
small ways.
Bakefile does not generate a configure or configure.in script, so if you want
to use configure scripts with your Unix-based software, you will need to learn
how to use autoconf. Unfortunately, this topic deserves a book all its own and
is beyond the scope of this tutorial, but a book on the subject can be found
online at: http://sources.redhat.com/autobook/. Note that you do not need to
use automake when you are using Bakefile, just autoconf, as Bakefile
essentially does the same thing as automake.
----------------------------
-- Targets --
Every project needs to have a target or targets, specifying what is to be
built. In Bakefile, you specify the target by creating a tag named with the
target type. The possible names for targets are:
exe create an executable file
dll create a shared library
lib create a static library
module create a library that is loaded at runtime (i.e. a plugin)
Note the sample above is an "exe" target. Once you create the target, all the
build settings, including flags and linker options, should be placed inside
the target tag, as they are in the sample above.
-- Adding Sources and Includes --
Obviously, you need to be able to add source and include files to your
project. You add sources using the "<sources>" tag (as shown above), and add
include directories using the "<include>" tag. You can add multiple <sources>
and <include> tags to add multiple source files, or you can also add multiple
sources and includes into one tag by separating them with a space, like so:
<sources>minimal.cpp minimal2.cpp minimal3.cpp</sources>
If your sources are in a subfolder of your Bakefile, you use the slash "/"
character to denote directories, even on Windows. (i.e. src/minimal.cpp) For
more options and flags, please consult the Bakefile documentation in the 'doc'
subfolder of Bakefile, or you can also find it on the Bakefile web site.
-- Build Options --
What if you want to offer a DEBUG and a RELEASE build? Or a UNICODE/ANSI
build? You can do this in Bakefile by creating options. To create an option,
use the "<option>" tag. A typical option has three important parts: a name, a
default value, and a comma-separated list of values. For example, here is how
to create a DEBUG option which builds debug by default:
<option name="DEBUG">
<default-value>1</default-value>
<values>0 1</values>
</option>
You can then test the value of this option and conditionally set build
settings, flags, etc. For more information on both options and conditional
statements, please refer to the Bakefile documentation.
-- Bakefile Presets/Templates and Includes --
It is common that most projects will reuse certain settings, or options, in
their makefiles. (i.e. DEBUG or static/dynamic library options) Also, it is
common to have to use settings from another project; for example, any project
that uses wxWidgets will need to build using the same flags and options that
wxWidgets was built with. Bakefile makes these things easier by allowing users
to create Bakefile templates, where you can store common settings.
Bakefile ships with a couple of templates, found in the 'presets' subfolder of
your Bakefile installation. The "simple.bkl" template adds a DEBUG option to
makefiles so you can build in release or debug mode. To add this template to
your project, simply add the tag "<include file="presets/simple.bkl"/>" to the
top of your Bakefile. Then, when creating your target, add the
"template="simple"" attribute to it. Now, once you build the makefile, your
users can write commands like:
nmake -f makefile.vc DEBUG=1
or
make -f GNUmakefile DEBUG=1
In order to build the software in debug mode.
To simplify the building of wxWidgets-based projects, wxWidgets contains a a
set of Bakefiles that automatically configure your build system to be
compatible with wxWidgets. As you'll notice in the sample above, the sample
project uses the wx template. Once you've included the template, your software
will now build with wxWidgets support.
But since the wx presets don't exist in the Bakefile presets subfolder,
Bakefile needs to know where to find these presets. The "-I" command adds the
wxpresets folder to Bakefile's search path.
If you regularly include Bakefile presets in places other than the Bakefile
presets folder, then you can set the BAKEFILE_PATHS environment variable so
that Bakefile can find these Bakefiles and include them in your project. This
way you no longer need to specify the -I flag each time you build.
Lastly, it's important to note that the Win 32 wx project Bakefiles come with
some common build options that users can use when building the software. These
options are:
Option Values Description
------ ------ -------------
WX_SHARED 0(default),1 Specify static or dynamic wx libs
WX_UNICODE 0(defualt),1 Use ANSI or UNICODE wx libs
WX_DEBUG 0,1(default) Use release or debug wx libs
*WX_VERSION 25,26(default) Specify version of wx libs
*Note: Any version of wx past 2.5 will be allowed here, so 25/26 is not a
complete list of values.
These options are not needed under Unix as wx-config can be used to specify
these options.
-- bakefile_gen - Automated Bakefile Scripts --
If you have a large project, you can imagine that the calls to Bakefile would
get more and more complex and unwieldly to manage. For this reason, a script
called bakefile_gen was created, which reads in a .bkgen file that provides
all the commands needed to build all the makefiles your project supports. A
discussion of how to use bakefile_gen is beyond the scope of this tutorial,
but it deserves mention because it can be invaluable to large projects.
Documentation on bakefile_gen can be found in the Bakefile documentation.
-- Conclusion --
This concludes our basic tutorial of the cross-platform Bakefile build system
management tool. From here, please be sure to take a good look at the Bakefile
documentation to see what else it is capable of. Please post questions to the
bakefile-devel@lists.sourceforge.net list, or if you have questions specific
to the wx template Bakefile, send an email to wx-users@lists.wxwidgets.org.
Enjoy using Bakefile!

View File

@@ -1,31 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<!--
Presents for building wxWidgets applications.
FIXME: docs
-->
<makefile>
<!-- this is just a wrapper that includes the real implementation: -->
<set var="__wx_included_impl">0</set>
<if cond="FORMAT in ['autoconf','gnu']">
<include file="wx_unix.bkl"/>
<set var="__wx_included_impl">1</set>
</if>
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<include file="wx_win32.bkl"/>
<set var="__wx_included_impl">1</set>
</if>
<if cond="__wx_included_impl=='0'">
<error>This format is not (yet) supported by wx preset.</error>
</if>
</makefile>

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