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
87 changed files with 80 additions and 7416 deletions

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,262 +0,0 @@
0.1.5-3
-------
xxxStdDialogButtonSizer pulldown menu with standard buttons.
Some fixes for selecting tools inside toolbar with test window open
(whole toolbar is selected).
Toolbars can be added inside windows.
0.1.5-2
-------
Using wx.GetDefaultPyEncoding/wx.SetDefaultPyEncoding for changing active encoding.
Fixed pasting siblings (Ctrl key pressed while pasting).
Dealed with ascii build (Python does not recognize 'ascii' as valid encoding).
If encoding is not specified it is not written in XRC. Will add more
customization in the future.
Changed to use SimpleTool instead or Toggle tool (does not work on Win32).
0.1.5-1
-------
Added wxWizard, wxWizardPageSimple (only from pull-down menu).
Hide command for test window.
Replacing classes works better.
Added Locate tool.
0.1.4-1
-------
Edit->Locate command (Ctrl-L) for quick selection of items.
Works with event-handling controls (buttons, text fields) but
not with labels/sizers.
Some improvements: relative paths for files supplied as command-
line argument work correctly, notebook panels are highlighted
better.
0.1.2-1
_______
Added support for wxGridBagSizer (supported in wxPython 2.5).
0.1.1-5
-------
Added subclass attribute.
0.1.1-4
-------
Fixed problems with wxStaticBitmap (stock_id attribute, icon type
switching).
Changed some dimensions in properties panel elements.
0.1.1-3
-------
Sizes of some controls were not normal on wxMSW. Fixed.
Some changes to test window code to make it resize better and to
have focus control with sawfish for all types of windows.
0.1.1-2
-------
Bugs with currentEncoding and frame testing fixed.
Some required parameters are set to default if missing.
Unsupported classes are tolerated, with warning message.
wxScrolledWindow added (to 'control' pulldown menu, not yet to the
tool palette).
Multi-line editing for labels and some values (wxTextCtrl,
wxHtmlWindow).
0.1.1-1
-------
Changed internationalization support. '-i' option removed, default
encoding is used (should be defined in sitecustomize.py, or 'ascii' by
default). When XRC file is opened with encoding specified,
translations are not used.
0.1.1
-----
Replace command added (not quite finished yet).
0.1.0
-----
Finally implemented tools panel for almost all controls (except
wxHtmlWindow, wxCalendarCtrl and wxGenericDirCtrl - they are too
rarely used).
Changed some sizes in panel to better work with different fonts.
Fixed double-refreshing after Ctrl+R.
Maybe something else that I've forgot. It's been a looong day... :)
0.0.9-6
-------
Added dialog unit support.
Dealing with non-specified required values (set to defaults, if exist).
Added 'minsize' parameter of sizeritem.
Added '-i' option to turn off translations and use international characters.
0.0.9-5
-------
Mac platform-specific checks.
0.0.9-4
-------
Implemented standard bitmap selection.
Fixed a bug in FlexGridSizer code.
0.0.9-3
-------
File browsing (for bitmaps/icons, etc.) had a small problem when current
file was not saved yet.
0.0.9-2
-------
Small bug fix for initial don't panic message.
0.0.9-1
-------
Changed program structure, reduced use of global variables (grouped in
module 'globals', which creates an instanse 'g' of class Globals.
First version of undo/redo working!
Support for toolbars inside panels and frames.
Added 'container' submenu for creating Panel, Notebook and ToolBar objects.
wxMSW-only: added code to switch focus back to main window when test
window is updated.
0.0.8-2
-------
Fixed unicode problem for unicode build.
0.0.8-1
-------
Using WX_2_4_BRANCH.
Added new controls: wxSpinCtrl, wxGenericDirCtrl, unknown (custom
control), improved wxXRC format suppor (menu styles, etc.).
Some I18N support: parsing "encoding" attribute in XML header, later
it can be modified in "properties" panel for "XML tree".
UNIX note: currently XML writing for non-ascii chars works only if
sys.getdefaultencoding() returns good value. To do this, one has to
put following lines to "sitecustomize.py" file:
# Start code segment
import sys
sys.setdefaultencoding('iso-8859-1') # or whatever
# End code segment
0.0.7
-----
Some command-line arguments.
"Test window" command and toolbar button.
New panel interphace (wxHTMLWindow is not used anymore).
Toggling between embedded and detached panel.
Cache for already used windows.
Current top-level control is bold, if test window shown.
Undo/redo broken.
CheckListBox does not work unless wxXRC source fixed (in both wxPytnon and
wxWin):
contrib/src/xrc/xmlrsall.cpp
45,46c45,46
< AddHandler(new wxListCtrlXmlHandler);
< #if CHECKLISTBOX
---
> AddHandler(new wxListCtrlXmlHandler);
> #if wxUSE_CHECKLISTBOX
This is fixed in CVS.
0.0.6
-----
Toolbar, bitmap, icon support (no display yet).
Changed parameter objects, added support for multiple parameters (like
`growablecols').
Fixed double-clicking problem with tree control on Windows.
Some performance improovements.
0.0.5
-----
Added notebook with properties page and style page. Fixed some problems
on Windows.
0.0.4
-----
Some fixes suggested by RD
0.0.3
-----
Faster preview window refresh.
Cut/Paste works better.
Some tree icons.
Tree item names.
Bugfixes.
0.0.2
-----
The first release.

View File

@@ -1,68 +0,0 @@
********************************************************************************
XRCed README
********************************************************************************
System requirements
-------------------
XRCed requires wxWindows and wxPython greater or equal to 2.3.3, and
Python 2.2 or newer (it may work with earlier version, but was not tested).
wxPython must be compiled with XRC support.
Short manual
------------
XRCed's idea is very straightforward: it is a visual tool for editing an XML
file conforming to XRC format. Every operation performed in XRCed has direct
correspondence to XML structure. So it is not really a usual point-and-click
GUI builder, but don't let that scare you.
To start xrced, change to the directory where you installed it and run
"python2.2 xrced.py".
On UNIX you can edit wrapper script "xrced.sh" to point to your installation
directory.
To create an object, first you should select some object in the tree (or the
root item if it's empty) then press the right mouse button and select an
appropriate command. The pulldown menu is context-dependent on the selected
object.
XRCed tries to guess if new object should be added as a next sibling or a
child of current object, depending on the possibility of the object to have
child objects and expanded state (if tree item is collapsed, new object will
be sibling). You can change this behavior to create siblings by pressing and
holding the Shift and Control keys before clicking the mouse.
Pressed Control key while pressing right button makes next item a sibling of
selected item regardless of its expanded state.
Pressed Shift key changes the place for inserting new child to be before
selected child, not after as by default.
Panel on the right contains object properties. Properties which are optional
should be "checked" first. This panel can be made separate by unchecking
"Embed Panel" in View menu.
All properties can be edited as text, and some are supplied with special
editing controls.
The names of the properties are exactly as in XRC file, and it's usually not
hard to guess what they do. XML ID is the name of the window, and must be
present for top-level windows (though this is not enforced by XRCed).
To display the preview window double-click a top-level object (you should
assign an XMLID to it first), press "Test" toolbar button or select command
from View menu, or press F5. After that, if you select a child object, it
becomes highlighted, and if you change it, preview is updated when you select
another item or press Ctrl-R (refresh). To turn off automatic update, toggle
"View->Auto-refresh" or toolbar auto-refresh button (to the right of the
refresh button).
--------------------------------------------------------------------------------
Copyright 2001-2003 Roman Rolinsky <rollrom@xrced.sourceforge.net>

View File

@@ -1,29 +0,0 @@
TODO for XRCed
==============
- better help
+ undo/redo
+ tree icons
- replace object with another, keeping children
+ write tmp file for current dialog/panel/etc.
+ XML indents
+ select same notebook pages after update
- put some default values in tree ctrl etc.
- special (fast) update for some values: pos/size, value/content, sizeritem
stuff (?), well, as much as possible
- highlighting with better method
- import XRC/WXR files
+ disable some window creation when it's not valid
- selecting object by clicking in test window

Binary file not shown.

Before

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 677 B

View File

@@ -1,4 +0,0 @@
#

View File

@@ -1,34 +0,0 @@
"""
A simple script to encode all the images the XRCed needs into a Python module
"""
import sys, os, glob
from wx.tools import img2py
def main():
output = 'images.py'
# get the list of PNG files
files = glob.glob('src-images/*.png')
files.sort()
# Truncate the inages module
open(output, 'w')
# call img2py on each file
for file in files:
# extract the basename to be used as the image name
name = os.path.splitext(os.path.basename(file))[0]
# encode it
if file == files[0]:
cmd = "-u -i -n %s %s %s" % (name, file, output)
else:
cmd = "-a -u -i -n %s %s %s" % (name, file, output)
img2py.main(cmd.split())
if __name__ == "__main__":
main()

View File

@@ -1,63 +0,0 @@
# Name: globals.py
# Purpose: XRC editor, global variables
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 02.12.2002
# RCS-ID: $Id$
from wxPython.wx import *
from wxPython.xrc import *
try:
from wxPython.wizard import *
except:
pass
import sys
# Global constants
progname = 'XRCed'
version = '0.1.5-3'
# Can be changed to set other default encoding different
#defaultEncoding = ''
# you comment above and can uncomment this:
defaultEncoding = wxGetDefaultPyEncoding()
try:
True
except NameError:
True = 1==1
False = 1==0
# Global variables
class Globals:
panel = None
tree = None
frame = None
tools = None
undoMan = None
testWin = None
testWinPos = wxDefaultPosition
currentXXX = None
currentEncoding = defaultEncoding
def _makeFonts(self):
self._sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)
self._labelFont = wxFont(self._sysFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD)
self._modernFont = wxFont(self._sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
self._smallerFont = wxFont(self._sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
def sysFont(self):
if not hasattr(self, "_sysFont"): self._makeFonts()
return self._sysFont
def labelFont(self):
if not hasattr(self, "_labelFont"): self._makeFonts()
return self._labelFont
def modernFont(self):
if not hasattr(self, "_modernFont"): self._makeFonts()
return self._modernFont
def smallerFont(self):
if not hasattr(self, "_smallerFont"): self._makeFonts()
return self._smallerFont
g = Globals()

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +0,0 @@
Copyright (c) 2002, Roman Rolinsky <rollrom@users.sourceforge.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

View File

@@ -1,384 +0,0 @@
# Name: panel.py
# Purpose: XRC editor, Panel class and related
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 02.12.2002
# RCS-ID: $Id$
from xxx import * # xxx imports globals and params
from undo import *
from wxPython.html import wxHtmlWindow
# Properties panel containing notebook
class Panel(wxNotebook):
def __init__(self, parent, id = -1):
if wxPlatform != '__WXMAC__': # some problems with this style on macs
wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
else:
wxNotebook.__init__(self, parent, id)
global panel
g.panel = panel = self
self.modified = False
# Set common button size for parameter buttons
bTmp = wxButton(self, -1, '')
import params
params.buttonSize = (self.DLG_SZE(buttonSize)[0], bTmp.GetSize()[1])
bTmp.Destroy()
del bTmp
# List of child windows
self.pages = []
# Create scrolled windows for pages
self.page1 = wxScrolledWindow(self, -1)
sizer = wxBoxSizer()
sizer.Add(wxBoxSizer()) # dummy sizer
self.page1.SetAutoLayout(True)
self.page1.SetSizer(sizer)
self.AddPage(self.page1, 'Properties')
# Second page
self.page2 = wxScrolledWindow(self, -1)
self.page2.Hide()
sizer = wxBoxSizer()
sizer.Add(wxBoxSizer()) # dummy sizer
self.page2.SetAutoLayout(True)
self.page2.SetSizer(sizer)
# Cache for already used panels
self.pageCache = {} # cached property panels
self.stylePageCache = {} # cached style panels
# Delete child windows and recreate page sizer
def ResetPage(self, page):
topSizer = page.GetSizer()
sizer = topSizer.GetChildren()[0].GetSizer()
for w in page.GetChildren():
sizer.Detach(w)
if isinstance(w, ParamPage):
if w.IsShown():
w.Hide()
else:
w.Destroy()
topSizer.Remove(sizer)
# Create new windows
sizer = wxBoxSizer(wxVERTICAL)
# Special case - resize html window
if g.conf.panic:
topSizer.Add(sizer, 1, wxEXPAND)
else:
topSizer.Add(sizer, 0, wxALL, 5)
return sizer
def SetData(self, xxx):
self.pages = []
# First page
# Remove current objects and sizer
sizer = self.ResetPage(self.page1)
if not xxx or (not xxx.allParams and not xxx.hasName and not xxx.hasChild):
if g.tree.selection:
sizer.Add(wxStaticText(self.page1, -1, 'This item has no properties.'))
else: # nothing selected
# If first time, show some help
if g.conf.panic:
html = wxHtmlWindow(self.page1, -1, wxDefaultPosition,
wxDefaultSize, wxSUNKEN_BORDER)
html.SetPage(g.helpText)
sizer.Add(html, 1, wxEXPAND)
g.conf.panic = False
else:
sizer.Add(wxStaticText(self.page1, -1, 'Select a tree item.'))
else:
g.currentXXX = xxx.treeObject()
# Normal or SizerItem page
isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)
cacheID = (xxx.__class__, isGBSizerItem)
try:
page = self.pageCache[cacheID]
page.box.SetLabel(xxx.panelName())
page.Show()
except KeyError:
page = PropPage(self.page1, xxx.panelName(), xxx)
self.pageCache[cacheID] = page
page.SetValues(xxx)
self.pages.append(page)
sizer.Add(page, 1, wxEXPAND)
if xxx.hasChild:
# Special label for child objects - they may have different GUI
cacheID = (xxx.child.__class__, xxx.__class__)
try:
page = self.pageCache[cacheID]
page.box.SetLabel(xxx.child.panelName())
page.Show()
except KeyError:
page = PropPage(self.page1, xxx.child.panelName(), xxx.child)
self.pageCache[cacheID] = page
page.SetValues(xxx.child)
self.pages.append(page)
sizer.Add(page, 0, wxEXPAND | wxTOP, 5)
self.page1.Layout()
size = self.page1.GetSizer().GetMinSize()
self.page1.SetScrollbars(1, 1, size.width, size.height, 0, 0, True)
# Second page
# Create if does not exist
if xxx and xxx.treeObject().hasStyle:
xxx = xxx.treeObject()
# Simplest case: set data if class is the same
sizer = self.ResetPage(self.page2)
try:
page = self.stylePageCache[xxx.__class__]
page.Show()
except KeyError:
page = StylePage(self.page2, xxx.className + ' style', xxx)
self.stylePageCache[xxx.__class__] = page
page.SetValues(xxx)
self.pages.append(page)
sizer.Add(page, 0, wxEXPAND)
# Add page if not exists
if not self.GetPageCount() == 2:
self.AddPage(self.page2, 'Style')
self.page2.Layout()
if 'wxGTK' in wx.PlatformInfo:
self.page2.Show(True)
size = self.page2.GetSizer().GetMinSize()
self.page2.SetScrollbars(1, 1, size.width, size.height, 0, 0, True)
else:
# Remove page if exists
if self.GetPageCount() == 2:
self.SetSelection(0)
self.page1.Refresh()
self.RemovePage(1)
self.modified = False
def Clear(self):
self.SetData(None)
self.modified = False
# If some parameter has changed
def IsModified(self):
return self.modified
def SetModified(self, value):
# Register undo object when modifying first time
if not self.modified and value:
g.undoMan.RegisterUndo(UndoEdit())
self.modified = value
def Apply(self):
for p in self.pages: p.Apply()
################################################################################
# General class for notebook pages
class ParamPage(wxPanel):
def __init__(self, parent, xxx):
wxPanel.__init__(self, parent, -1)
self.xxx = xxx
# Register event handlers
for id in paramIDs.values():
EVT_CHECKBOX(self, id, self.OnCheckParams)
self.checks = {}
self.controls = {} # save python objects
self.controlName = None
def OnCheckParams(self, evt):
xxx = self.xxx
param = evt.GetEventObject().GetName()
w = self.controls[param]
w.Enable(True)
objElem = xxx.element
if evt.IsChecked():
# Ad new text node in order of allParams
w.SetValue('') # set empty (default) value
w.SetModified() # mark as changed
elem = g.tree.dom.createElement(param)
# Some classes are special
if param == 'font':
xxx.params[param] = xxxParamFont(xxx.element, elem)
elif param in xxxObject.bitmapTags:
xxx.params[param] = xxxParamBitmap(elem)
else:
xxx.params[param] = xxxParam(elem)
# Find place to put new element: first present element after param
found = False
if xxx.hasStyle:
paramStyles = xxx.allParams + xxx.styles
else:
paramStyles = xxx.allParams
for p in paramStyles[paramStyles.index(param) + 1:]:
# Content params don't have same type
if xxx.params.has_key(p) and p != 'content':
found = True
break
if found:
nextTextElem = xxx.params[p].node
objElem.insertBefore(elem, nextTextElem)
else:
objElem.appendChild(elem)
else:
# Remove parameter
xxx.params[param].remove()
del xxx.params[param]
w.SetValue('')
w.modified = False # mark as not changed
w.Enable(False)
# Set modified flag (provokes undo storing is necessary)
panel.SetModified(True)
def Apply(self):
xxx = self.xxx
if self.controlName:
name = self.controlName.GetValue()
if xxx.name != name:
xxx.name = name
xxx.element.setAttribute('name', name)
for param, w in self.controls.items():
if w.modified:
paramObj = xxx.params[param]
value = w.GetValue()
if param in xxx.specials:
xxx.setSpecial(param, value)
else:
paramObj.update(value)
# Save current state
def SaveState(self):
self.origChecks = map(lambda i: (i[0], i[1].GetValue()), self.checks.items())
self.origControls = map(lambda i: (i[0], i[1].GetValue(), i[1].IsEnabled()),
self.controls.items())
if self.controlName:
self.origName = self.controlName.GetValue()
# Return original values
def GetState(self):
if self.controlName:
return (self.origChecks, self.origControls, self.origName)
else:
return (self.origChecks, self.origControls)
# Set values from undo data
def SetState(self, state):
for k,v in state[0]:
self.checks[k].SetValue(v)
for k,v,e in state[1]:
self.controls[k].SetValue(v)
self.controls[k].Enable(e)
if e: self.controls[k].modified = True
if self.controlName:
self.controlName.SetValue(state[2])
################################################################################
LABEL_WIDTH = 125
# Panel for displaying properties
class PropPage(ParamPage):
def __init__(self, parent, label, xxx):
ParamPage.__init__(self, parent, xxx)
self.box = wxStaticBox(self, -1, label)
self.box.SetFont(g.labelFont())
topSizer = wxStaticBoxSizer(self.box, wxVERTICAL)
sizer = wxFlexGridSizer(len(xxx.allParams), 2, 1, 1)
sizer.AddGrowableCol(1)
if xxx.hasName:
label = wxStaticText(self, -1, 'XML ID:', size=(LABEL_WIDTH,-1))
control = ParamText(self, 'XML_name', 200)
sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
(control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxGROW, 5) ])
self.controlName = control
for param in xxx.allParams:
present = xxx.params.has_key(param)
if param in xxx.required:
label = wxStaticText(self, paramIDs[param], param + ':',
size = (LABEL_WIDTH,-1), name = param)
else:
# Notebook has one very loooooong parameter
if param == 'usenotebooksizer': sParam = 'usesizer:'
else: sParam = param + ':'
label = wxCheckBox(self, paramIDs[param], sParam,
size = (LABEL_WIDTH,-1), name = param)
self.checks[param] = label
try:
typeClass = xxx.paramDict[param]
except KeyError:
try:
# Standart type
typeClass = paramDict[param]
except KeyError:
# Default
typeClass = ParamText
control = typeClass(self, param)
control.Enable(present)
sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
(control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
self.controls[param] = control
topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
self.SetAutoLayout(True)
self.SetSizer(topSizer)
topSizer.Fit(self)
def SetValues(self, xxx):
self.xxx = xxx
self.origChecks = []
self.origControls = []
# Set values, checkboxes to False, disable defaults
if xxx.hasName:
self.controlName.SetValue(xxx.name)
self.origName = xxx.name
for param in xxx.allParams:
w = self.controls[param]
w.modified = False
try:
value = xxx.params[param].value()
w.Enable(True)
w.SetValue(value)
if not param in xxx.required:
self.checks[param].SetValue(True)
self.origChecks.append((param, True))
self.origControls.append((param, value, True))
except KeyError:
self.checks[param].SetValue(False)
w.SetValue('')
w.Enable(False)
self.origChecks.append((param, False))
self.origControls.append((param, '', False))
################################################################################
# Style notebook page
class StylePage(ParamPage):
def __init__(self, parent, label, xxx):
ParamPage.__init__(self, parent, xxx)
box = wxStaticBox(self, -1, label)
box.SetFont(g.labelFont())
topSizer = wxStaticBoxSizer(box, wxVERTICAL)
sizer = wxFlexGridSizer(len(xxx.styles), 2, 1, 1)
sizer.AddGrowableCol(1)
for param in xxx.styles:
present = xxx.params.has_key(param)
check = wxCheckBox(self, paramIDs[param],
param + ':', size = (LABEL_WIDTH,-1), name = param)
check.SetValue(present)
control = paramDict[param](self, name = param)
control.Enable(present)
sizer.AddMany([ (check, 0, wxALIGN_CENTER_VERTICAL),
(control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
self.checks[param] = check
self.controls[param] = control
topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
self.SetAutoLayout(True)
self.SetSizer(topSizer)
topSizer.Fit(self)
# Set data for a cahced page
def SetValues(self, xxx):
self.xxx = xxx
self.origChecks = []
self.origControls = []
for param in xxx.styles:
present = xxx.params.has_key(param)
check = self.checks[param]
check.SetValue(present)
w = self.controls[param]
w.modified = False
if present:
value = xxx.params[param].value()
else:
value = ''
w.SetValue(value)
w.Enable(present)
self.origChecks.append((param, present))
self.origControls.append((param, value, present))

View File

@@ -1,879 +0,0 @@
# Name: params.py
# Purpose: Classes for parameter introduction
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 22.08.2001
# RCS-ID: $Id$
import string
import os.path
from globals import *
from types import *
from wxPython.xrc import *
genericStyles = [
'wxSIMPLE_BORDER', 'wxDOUBLE_BORDER', 'wxSUNKEN_BORDER',
'wxRAISED_BORDER', 'wxSTATIC_BORDER', 'wxNO_BORDER',
'wxTRANSPARENT_WINDOW', 'wxTAB_TRAVERSAL',
'wxWANTS_CHARS',
'wxNO_FULL_REPAINT_ON_RESIZE',
'wxVSCROLL', 'wxHSCROLL', 'wxALWAYS_SHOW_SB',
'wxCLIP_CHILDREN',
'wxFULL_REPAINT_ON_RESIZE'
]
genericExStyles = [
'wxWS_EX_VALIDATE_RECURSIVELY',
'wxWS_EX_BLOCK_EVENTS',
'wxWS_EX_TRANSIENT',
'wxFRAME_EX_CONTEXTHELP',
'wxWS_EX_PROCESS_IDLE',
'wxWS_EX_PROCESS_UI_UPDATES'
]
buttonSize = (35,-1) # in dialog units, transformed to pixels in panel ctor
# Class that can properly disable children
class PPanel(wxPanel):
def __init__(self, parent, name):
wxPanel.__init__(self, parent, -1, name=name)
self.modified = self.freeze = False
def Enable(self, value):
# Something strange is going on with enable so we make sure...
for w in self.GetChildren():
w.Enable(value)
wxPanel.Enable(self, value)
def SetModified(self):
self.modified = True
g.panel.SetModified(True)
# Common method to set modified state
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
class ParamBinaryOr(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_CHOICES = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxButton(self, self.ID_BUTTON_CHOICES, 'Edit...', size=buttonSize)
sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
EVT_BUTTON(self, self.ID_BUTTON_CHOICES, self.OnButtonChoices)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def GetValue(self):
return self.text.GetValue()
def SetValue(self, value):
self.freeze = True
self.text.SetValue(value)
self.freeze = False
def OnButtonChoices(self, evt):
dlg = g.frame.res.LoadDialog(self, 'DIALOG_CHOICES')
listBox = XRCCTRL(dlg, 'CHECK_LIST')
listBox.InsertItems(self.values, 0)
value = map(string.strip, self.text.GetValue().split('|'))
if value == ['']: value = []
ignored = []
for i in value:
try:
listBox.Check(self.values.index(i))
except ValueError:
# Try to find equal
if self.equal.has_key(i):
listBox.Check(self.values.index(self.equal[i]))
else:
print 'WARNING: unknown flag: %s: ignored.' % i
ignored.append(i)
if dlg.ShowModal() == wxID_OK:
value = []
for i in range(listBox.GetCount()):
if listBox.IsChecked(i):
value.append(self.values[i])
# Add ignored flags
value.extend(ignored)
if value:
self.SetValue(reduce(lambda a,b: a+'|'+b, value))
else:
self.SetValue('')
self.SetModified()
dlg.Destroy()
class ParamFlag(ParamBinaryOr):
values = ['wxTOP', 'wxBOTTOM', 'wxLEFT', 'wxRIGHT', 'wxALL',
'wxEXPAND', 'wxGROW', 'wxSHAPED', 'wxALIGN_CENTRE', 'wxALIGN_RIGHT',
'wxFIXED_MINSIZE',
'wxALIGN_BOTTOM', 'wxALIGN_CENTRE_VERTICAL',
'wxALIGN_CENTRE_HORIZONTAL',
]
equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE',
'wxALIGN_CENTER_VERTICAL': 'wxALIGN_CENTRE_VERTICAL',
'wxALIGN_CENTER_HORIZONTAL': 'wxALIGN_CENTRE_HORIZONTAL'}
def __init__(self, parent, name):
ParamBinaryOr.__init__(self, parent, name)
class ParamStyle(ParamBinaryOr):
equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE'}
def __init__(self, parent, name):
self.values = g.currentXXX.winStyles + genericStyles
ParamBinaryOr.__init__(self, parent, name)
class ParamNonGenericStyle(ParamBinaryOr):
def __init__(self, parent, name):
self.values = g.currentXXX.winStyles
ParamBinaryOr.__init__(self, parent, name)
class ParamExStyle(ParamBinaryOr):
def __init__(self, parent, name):
if g.currentXXX:
self.values = g.currentXXX.exStyles + genericExStyles
else:
self.values = []
ParamBinaryOr.__init__(self, parent, name)
class ParamColour(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(65,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxPanel(self, self.ID_BUTTON, wxDefaultPosition, wxSize(20, 1))
sizer.Add(self.button, 0, wxGROW | wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
self.textModified = False
EVT_PAINT(self.button, self.OnPaintButton)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
EVT_LEFT_DOWN(self.button, self.OnLeftDown)
def GetValue(self):
return self.text.GetValue()
def SetValue(self, value):
self.freeze = True
if not value: value = '#FFFFFF'
self.text.SetValue(str(value)) # update text ctrl
colour = wxColour(int(value[1:3], 16), int(value[3:5], 16), int(value[5:7], 16))
self.button.SetBackgroundColour(colour)
self.button.Refresh()
self.freeze = False
def OnPaintButton(self, evt):
dc = wxPaintDC(self.button)
dc.SetBrush(wxTRANSPARENT_BRUSH)
if self.IsEnabled(): dc.SetPen(wxBLACK_PEN)
else: dc.SetPen(wxGREY_PEN)
size = self.button.GetSize()
dc.DrawRectangle(0, 0, size.width, size.height)
def OnLeftDown(self, evt):
data = wxColourData()
data.SetColour(self.GetValue())
dlg = wxColourDialog(self, data)
if dlg.ShowModal() == wxID_OK:
self.SetValue('#%02X%02X%02X' % dlg.GetColourData().GetColour().Get())
self.SetModified()
dlg.Destroy()
################################################################################
# Mapping from wx constants ro XML strings
fontFamiliesWx2Xml = {wxDEFAULT: 'default', wxDECORATIVE: 'decorative',
wxROMAN: 'roman', wxSCRIPT: 'script', wxSWISS: 'swiss',
wxMODERN: 'modern'}
fontStylesWx2Xml = {wxNORMAL: 'normal', wxSLANT: 'slant', wxITALIC: 'italic'}
fontWeightsWx2Xml = {wxNORMAL: 'normal', wxLIGHT: 'light', wxBOLD: 'bold'}
def ReverseMap(m):
rm = {}
for k,v in m.items(): rm[v] = k
return rm
fontFamiliesXml2wx = ReverseMap(fontFamiliesWx2Xml)
fontStylesXml2wx = ReverseMap(fontStylesWx2Xml)
fontWeightsXml2wx = ReverseMap(fontWeightsWx2Xml)
class ParamFont(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_SELECT = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxButton(self, self.ID_BUTTON_SELECT, 'Select...', size=buttonSize)
sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
self.textModified = False
EVT_BUTTON(self, self.ID_BUTTON_SELECT, self.OnButtonSelect)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt):
PPanel.OnChange(self, evt)
self.textModified = True
def _defaultValue(self):
return ['12', 'default', 'normal', 'normal', '0', '', '']
def GetValue(self):
if self.textModified: # text has newer value
try:
return eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
return self._defaultValue()
return self.value
def SetValue(self, value):
self.freeze = True # disable other handlers
if not value: value = self._defaultValue()
self.value = value
self.text.SetValue(str(value)) # update text ctrl
self.freeze = False
def OnButtonSelect(self, evt):
if self.textModified: # text has newer value
try:
self.value = eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
self.value = self._defaultValue()
# Make initial font
# Default values
size = 12
family = wxDEFAULT
style = weight = wxNORMAL
underlined = 0
face = ''
enc = wxFONTENCODING_DEFAULT
# Fall back to default if exceptions
error = False
try:
try: size = int(self.value[0])
except ValueError: error = True; wxLogError('Invalid size specification')
try: family = fontFamiliesXml2wx[self.value[1]]
except KeyError: error = True; wxLogError('Invalid family specification')
try: style = fontStylesXml2wx[self.value[2]]
except KeyError: error = True; wxLogError('Invalid style specification')
try: weight = fontWeightsXml2wx[self.value[3]]
except KeyError: error = True; wxLogError('Invalid weight specification')
try: underlined = bool(self.value[4])
except ValueError: error = True; wxLogError('Invalid underlined flag specification')
face = self.value[5]
except IndexError:
error = True
mapper = wxFontMapper()
if not self.value[6]: enc = mapper.CharsetToEncoding(self.value[6])
if error: wxLogError('Invalid font specification')
if enc == wxFONTENCODING_DEFAULT: enc = wxFONTENCODING_SYSTEM
font = wxFont(size, family, style, weight, underlined, face, enc)
data = wxFontData()
data.SetInitialFont(font)
dlg = wxFontDialog(self, data)
if dlg.ShowModal() == wxID_OK:
font = dlg.GetFontData().GetChosenFont()
print font.GetEncoding()
if font.GetEncoding() == wxFONTENCODING_SYSTEM:
encName = ''
else:
encName = wxFontMapper_GetEncodingName(font.GetEncoding()).encode()
value = [str(font.GetPointSize()),
fontFamiliesWx2Xml.get(font.GetFamily(), "default"),
fontStylesWx2Xml.get(font.GetStyle(), "normal"),
fontWeightsWx2Xml.get(font.GetWeight(), "normal"),
str(int(font.GetUnderlined())),
font.GetFaceName().encode(),
encName
]
# Add ignored flags
self.SetValue(value)
self.SetModified()
self.textModified = False
dlg.Destroy()
################################################################################
class ParamInt(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_SPIN_CTRL = wxNewId()
sizer = wxBoxSizer()
self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=(50,-1))
sizer.Add(self.spin)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
EVT_SPINCTRL(self, self.ID_SPIN_CTRL, self.OnChange)
def GetValue(self):
return str(self.spin.GetValue())
def SetValue(self, value):
self.freeze = True
if not value: value = 0
self.spin.SetValue(int(value))
self.freeze = False
# Same as int but allows dialog units (XXXd)
class ParamUnit(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_SPIN_BUTTON = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(35,-1))
self.spin = wxSpinButton(self, self.ID_SPIN_BUTTON, style = wxSP_VERTICAL, size=(-1,1))
self.spin.SetRange(-10000, 10000)
sizer.Add(self.text, 0, wxEXPAND | wxRIGHT, 2)
sizer.Add(self.spin, 0, wxEXPAND)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
EVT_SPIN_UP(self, self.ID_SPIN_BUTTON, self.OnSpinUp)
EVT_SPIN_DOWN(self, self.ID_SPIN_BUTTON, self.OnSpinDown)
def GetValue(self):
return self.text.GetValue()
def SetValue(self, value):
self.freeze = True
if not value: value = '0'
self.text.SetValue(value)
self.freeze = False
def Change(self, x):
# Check if we are working with dialog units
value = self.text.GetValue()
units = ''
if value[-1].upper() == 'D':
units = value[-1]
value = value[:-1]
try:
intValue = int(value) + x
self.spin.SetValue(intValue)
self.text.SetValue(str(intValue) + units)
self.SetModified()
except:
# !!! Strange, if I use wxLogWarning, event is re-generated
print 'incorrect unit format'
def OnSpinUp(self, evt):
self.Change(1)
def OnSpinDown(self, evt):
self.Change(-1)
class ParamMultilineText(PPanel):
def __init__(self, parent, name, textWidth=-1):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_EDIT = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxButton(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)
sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def GetValue(self):
return self.text.GetValue()
def SetValue(self, value):
self.freeze = True # disable other handlers
self.text.SetValue(value)
self.freeze = False # disable other handlers
def OnButtonEdit(self, evt):
dlg = g.frame.res.LoadDialog(self, 'DIALOG_TEXT')
textCtrl = XRCCTRL(dlg, 'TEXT')
textCtrl.SetValue(self.text.GetValue())
if dlg.ShowModal() == wxID_OK:
self.text.SetValue(textCtrl.GetValue())
self.SetModified()
dlg.Destroy()
class ParamText(PPanel):
def __init__(self, parent, name, textWidth=-1):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
# We use sizer even here to have the same size of text control
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1))
if textWidth == -1: option = 1
else: option = 0
sizer.Add(self.text, option, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def GetValue(self):
return self.text.GetValue()
def SetValue(self, value):
self.freeze = True # disable other handlers
self.text.SetValue(value)
self.freeze = False # disable other handlers
class ParamAccel(ParamText):
def __init__(self, parent, name):
ParamText.__init__(self, parent, name, 100)
class ParamPosSize(ParamText):
def __init__(self, parent, name):
ParamText.__init__(self, parent, name, 80)
class ParamLabel(ParamText):
def __init__(self, parent, name):
ParamText.__init__(self, parent, name, 200)
class ParamEncoding(ParamText):
def __init__(self, parent, name):
ParamText.__init__(self, parent, name, 100)
class ContentDialog(wxDialog):
def __init__(self, parent, value):
# Load from resource
pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
self.this = pre.this
self._setOORInfo(self)
self.list = XRCCTRL(self, 'LIST')
# Set list items
for v in value:
self.list.Append(v)
self.SetAutoLayout(True)
self.GetSizer().Fit(self)
# Callbacks
self.ID_BUTTON_APPEND = XRCID('BUTTON_APPEND')
self.ID_BUTTON_REMOVE = XRCID('BUTTON_REMOVE')
self.ID_BUTTON_UP = XRCID('BUTTON_UP')
self.ID_BUTTON_DOWN = XRCID('BUTTON_DOWN')
EVT_BUTTON(self, self.ID_BUTTON_UP, self.OnButtonUp)
EVT_BUTTON(self, self.ID_BUTTON_DOWN, self.OnButtonDown)
EVT_BUTTON(self, self.ID_BUTTON_APPEND, self.OnButtonAppend)
EVT_BUTTON(self, self.ID_BUTTON_REMOVE, self.OnButtonRemove)
EVT_UPDATE_UI(self, self.ID_BUTTON_UP, self.OnUpdateUI)
EVT_UPDATE_UI(self, self.ID_BUTTON_DOWN, self.OnUpdateUI)
EVT_UPDATE_UI(self, self.ID_BUTTON_REMOVE, self.OnUpdateUI)
def OnButtonUp(self, evt):
i = self.list.GetSelection()
str = self.list.GetString(i)
self.list.Delete(i)
self.list.InsertItems([str], i-1)
self.list.SetSelection(i-1)
def OnButtonDown(self, evt):
i = self.list.GetSelection()
str = self.list.GetString(i)
self.list.Delete(i)
self.list.InsertItems([str], i+1)
self.list.SetSelection(i+1)
def OnButtonAppend(self, evt):
str = wxGetTextFromUser('Enter new item:', 'Append', '', self)
self.list.Append(str)
def OnButtonRemove(self, evt):
self.list.Delete(self.list.GetSelection())
def OnUpdateUI(self, evt):
if evt.GetId() == self.ID_BUTTON_REMOVE:
evt.Enable(self.list.GetSelection() != -1)
elif evt.GetId() == self.ID_BUTTON_UP:
evt.Enable(self.list.GetSelection() > 0)
elif evt.GetId() == self.ID_BUTTON_DOWN:
evt.Enable(self.list.GetSelection() != -1 and \
self.list.GetSelection() < self.list.GetCount() - 1)
class ContentCheckListDialog(wxDialog):
def __init__(self, parent, value):
pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
self.this = pre.this
self._setOORInfo(self)
self.list = XRCCTRL(self, 'CHECK_LIST')
# Set list items
i = 0
for v,ch in value:
self.list.Append(v)
self.list.Check(i, ch)
i += 1
self.SetAutoLayout(True)
self.GetSizer().Fit(self)
# Callbacks
self.ID_BUTTON_APPEND = XRCID('BUTTON_APPEND')
self.ID_BUTTON_REMOVE = XRCID('BUTTON_REMOVE')
self.ID_BUTTON_UP = XRCID('BUTTON_UP')
self.ID_BUTTON_DOWN = XRCID('BUTTON_DOWN')
EVT_CHECKLISTBOX(self, self.list.GetId(), self.OnCheck)
EVT_BUTTON(self, self.ID_BUTTON_UP, self.OnButtonUp)
EVT_BUTTON(self, self.ID_BUTTON_DOWN, self.OnButtonDown)
EVT_BUTTON(self, self.ID_BUTTON_APPEND, self.OnButtonAppend)
EVT_BUTTON(self, self.ID_BUTTON_REMOVE, self.OnButtonRemove)
EVT_UPDATE_UI(self, self.ID_BUTTON_UP, self.OnUpdateUI)
EVT_UPDATE_UI(self, self.ID_BUTTON_DOWN, self.OnUpdateUI)
EVT_UPDATE_UI(self, self.ID_BUTTON_REMOVE, self.OnUpdateUI)
def OnCheck(self, evt):
# !!! Wrong wxGTK (wxMSW?) behavior: toggling selection if checking
self.list.Deselect(evt.GetSelection())
def OnButtonUp(self, evt):
i = self.list.GetSelection()
str, ch = self.list.GetString(i), self.list.IsChecked(i)
self.list.Delete(i)
self.list.InsertItems([str], i-1)
self.list.Check(i-1, ch)
self.list.SetSelection(i-1)
def OnButtonDown(self, evt):
i = self.list.GetSelection()
str, ch = self.list.GetString(i), self.list.IsChecked(i)
self.list.Delete(i)
self.list.InsertItems([str], i+1)
self.list.Check(i+1, ch)
self.list.SetSelection(i+1)
def OnButtonAppend(self, evt):
str = wxGetTextFromUser('Enter new item:', 'Append', '', self)
self.list.Append(str)
def OnButtonRemove(self, evt):
self.list.Delete(self.list.GetSelection())
def OnUpdateUI(self, evt):
if evt.GetId() == self.ID_BUTTON_REMOVE:
evt.Enable(self.list.GetSelection() != -1)
elif evt.GetId() == self.ID_BUTTON_UP:
evt.Enable(self.list.GetSelection() > 0)
elif evt.GetId() == self.ID_BUTTON_DOWN:
evt.Enable(self.list.GetSelection() != -1 and \
self.list.GetSelection() < self.list.GetCount() - 1)
class ParamContent(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_EDIT = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxButton(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)
sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
self.textModified = False
EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt):
PPanel.OnChange(self, evt)
self.textModified = True
def GetValue(self):
if self.textModified: # text has newer value
try:
return eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
return []
return self.value
def SetValue(self, value):
self.freeze = True
if not value: value = []
self.value = value
self.text.SetValue(str(value)) # update text ctrl
self.freeze = False
def OnButtonEdit(self, evt):
if self.textModified: # text has newer value
try:
self.value = eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
self.value = []
dlg = ContentDialog(self, self.value)
if dlg.ShowModal() == wxID_OK:
value = []
for i in range(dlg.list.GetCount()):
value.append(dlg.list.GetString(i))
# Add ignored flags
self.SetValue(value)
self.SetModified()
self.textModified = False
dlg.Destroy()
# CheckList content
class ParamContentCheckList(ParamContent):
def __init__(self, parent, name):
ParamContent.__init__(self, parent, name)
def OnButtonEdit(self, evt):
if self.textModified: # text has newer value
try:
self.value = eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
self.value = []
dlg = ContentCheckListDialog(self, self.value)
if dlg.ShowModal() == wxID_OK:
value = []
for i in range(dlg.list.GetCount()):
value.append((dlg.list.GetString(i), dlg.list.IsChecked(i)))
# Add ignored flags
self.SetValue(value)
self.SetModified()
self.textModified = False
dlg.Destroy()
class IntListDialog(wxDialog):
def __init__(self, parent, value):
pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
self.this = pre.this
self._setOORInfo(self)
self.list = XRCCTRL(self, 'LIST')
# Set list items
value.sort()
for v in value:
if type(v) != IntType:
wxLogError('Invalid item type')
else:
self.list.Append(str(v))
self.SetAutoLayout(True)
self.GetSizer().Fit(self)
# Callbacks
self.ID_BUTTON_ADD = XRCID('BUTTON_ADD')
self.ID_BUTTON_REMOVE = XRCID('BUTTON_REMOVE')
EVT_BUTTON(self, self.ID_BUTTON_ADD, self.OnButtonAppend)
EVT_BUTTON(self, self.ID_BUTTON_REMOVE, self.OnButtonRemove)
EVT_UPDATE_UI(self, self.ID_BUTTON_REMOVE, self.OnUpdateUI)
def OnButtonAppend(self, evt):
s = wxGetTextFromUser('Enter new number:', 'Add', '', self)
if not s: return
# Check that it's unique
try:
v = int(s)
s = str(v) # to be sure
i = self.list.FindString(s)
if i == -1: # ignore non-unique
# Find place to insert
found = False
for i in range(self.list.GetCount()):
if int(self.list.GetString(i)) > v:
found = True
break
if found: self.list.InsertItems([s], i)
else: self.list.Append(s)
except ValueError:
wxLogError('List item is not an int!')
def OnButtonRemove(self, evt):
self.list.Delete(self.list.GetSelection())
def OnUpdateUI(self, evt):
if evt.GetId() == self.ID_BUTTON_REMOVE:
evt.Enable(self.list.GetSelection() != -1)
# For growable list
class ParamIntList(ParamContent):
def __init__(self, parent, name):
ParamContent.__init__(self, parent, name)
def OnButtonEdit(self, evt):
if self.textModified: # text has newer value
try:
self.value = eval(self.text.GetValue())
except SyntaxError:
wxLogError('Syntax error in parameter value: ' + self.GetName())
self.value = []
dlg = IntListDialog(self, self.value)
if dlg.ShowModal() == wxID_OK:
value = []
for i in range(dlg.list.GetCount()):
value.append(int(dlg.list.GetString(i)))
# Add ignored flags
self.SetValue(value)
self.SetModified()
self.textModified = False
dlg.Destroy()
# Boxless radiobox
class RadioBox(PPanel):
def __init__(self, parent, id, choices,
pos=wxDefaultPosition, name='radiobox'):
PPanel.__init__(self, parent, name)
self.choices = choices
topSizer = wxBoxSizer()
for i in choices:
button = wxRadioButton(self, -1, i, size=(-1,buttonSize[1]), name=i)
topSizer.Add(button, 0, wxRIGHT, 5)
EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice)
self.SetAutoLayout(True)
self.SetSizer(topSizer)
topSizer.Fit(self)
def SetStringSelection(self, value):
self.freeze = True
for i in self.choices:
self.FindWindowByName(i).SetValue(i == value)
self.value = value
self.freeze = False
def OnRadioChoice(self, evt):
if self.freeze: return
if evt.GetSelection():
self.value = evt.GetEventObject().GetName()
self.SetModified()
def GetStringSelection(self):
return self.value
class ParamBool(RadioBox):
values = {'yes': '1', 'no': '0'}
seulav = {'1': 'yes', '0': 'no'}
def __init__(self, parent, name):
RadioBox.__init__(self, parent, -1, choices=self.values.keys(), name=name)
def GetValue(self):
return self.values[self.GetStringSelection()]
def SetValue(self, value):
if not value: value = '1'
self.SetStringSelection(self.seulav[value])
class ParamOrient(RadioBox):
values = {'horizontal': 'wxHORIZONTAL', 'vertical': 'wxVERTICAL'}
seulav = {'wxHORIZONTAL': 'horizontal', 'wxVERTICAL': 'vertical'}
def __init__(self, parent, name):
RadioBox.__init__(self, parent, -1, choices=self.values.keys(), name=name)
def GetValue(self):
return self.values[self.GetStringSelection()]
def SetValue(self, value):
if not value: value = 'wxHORIZONTAL'
self.SetStringSelection(self.seulav[value])
class ParamOrientation(RadioBox):
values = {'horizontal': 'horizontal', 'vertical': 'vertical'}
seulav = {'horizontal': 'horizontal', 'vertical': 'vertical'}
def __init__(self, parent, name):
RadioBox.__init__(self, parent, -1, choices=self.values.keys(), name=name)
def GetValue(self):
return self.values[self.GetStringSelection()]
def SetValue(self, value):
if not value: value = 'vertical'
self.SetStringSelection(self.seulav[value])
class ParamFile(PPanel):
def __init__(self, parent, name):
PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_BROWSE = wxNewId()
sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
self.button = wxButton(self, self.ID_BUTTON_BROWSE, 'Browse...',size=buttonSize)
sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(True)
self.SetSizer(sizer)
sizer.Fit(self)
self.textModified = False
EVT_BUTTON(self, self.ID_BUTTON_BROWSE, self.OnButtonBrowse)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt):
PPanel.OnChange(self, evt)
self.textModified = True
def GetValue(self):
if self.textModified: # text has newer value
return self.text.GetValue()
return self.value
def SetValue(self, value):
self.freeze = True
self.value = value
self.text.SetValue(value) # update text ctrl
self.freeze = False
def OnButtonBrowse(self, evt):
if self.textModified: # text has newer value
self.value = self.text.GetValue()
dlg = wxFileDialog(self,
defaultDir = os.path.abspath(os.path.dirname(self.value)),
defaultFile = os.path.basename(self.value))
if dlg.ShowModal() == wxID_OK:
# Get common part of selected path and current
if g.frame.dataFile:
curpath = os.path.abspath(g.frame.dataFile)
else:
curpath = os.path.join(os.getcwd(), '')
common = os.path.commonprefix([curpath, dlg.GetPath()])
self.SetValue(dlg.GetPath()[len(common):])
self.SetModified()
self.textModified = False
dlg.Destroy()
class ParamBitmap(PPanel):
def __init__(self, parent, name):
pre = wxPrePanel()
g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
self.this = pre.this
self._setOORInfo(self)
self.modified = self.freeze = False
self.radio_std = XRCCTRL(self, 'RADIO_STD')
self.radio_file = XRCCTRL(self, 'RADIO_FILE')
self.combo = XRCCTRL(self, 'COMBO_STD')
self.text = XRCCTRL(self, 'TEXT_FILE')
self.button = XRCCTRL(self, 'BUTTON_BROWSE')
self.textModified = False
self.SetAutoLayout(True)
self.GetSizer().SetMinSize((260, -1))
self.GetSizer().Fit(self)
EVT_RADIOBUTTON(self, XRCID('RADIO_STD'), self.OnRadioStd)
EVT_RADIOBUTTON(self, XRCID('RADIO_FILE'), self.OnRadioFile)
EVT_BUTTON(self, XRCID('BUTTON_BROWSE'), self.OnButtonBrowse)
EVT_COMBOBOX(self, XRCID('COMBO_STD'), self.OnCombo)
EVT_TEXT(self, XRCID('COMBO_STD'), self.OnChange)
EVT_TEXT(self, XRCID('TEXT_FILE'), self.OnChange)
def OnRadioStd(self, evt):
self.SetModified()
self.SetValue(['wxART_MISSING_IMAGE',''])
def OnRadioFile(self, evt):
self.SetModified()
self.SetValue(['',''])
def updateRadios(self):
if self.value[0]:
self.radio_std.SetValue(True)
self.radio_file.SetValue(False)
self.text.Enable(False)
self.button.Enable(False)
self.combo.Enable(True)
else:
self.radio_std.SetValue(False)
self.radio_file.SetValue(True)
self.text.Enable(True)
self.button.Enable(True)
self.combo.Enable(False)
def OnChange(self, evt):
PPanel.OnChange(self, evt)
self.textModified = True
def OnCombo(self, evt):
PPanel.OnChange(self, evt)
self.value[0] = self.combo.GetValue()
def GetValue(self):
if self.textModified: # text has newer value
return [self.combo.GetValue(), self.text.GetValue()]
return self.value
def SetValue(self, value):
self.freeze = True
if not value:
self.value = ['', '']
else:
self.value = value
self.combo.SetValue(self.value[0])
self.text.SetValue(self.value[1]) # update text ctrl
self.updateRadios()
self.freeze = False
def OnButtonBrowse(self, evt):
if self.textModified: # text has newer value
self.value[1] = self.text.GetValue()
dlg = wxFileDialog(self,
defaultDir = os.path.abspath(os.path.dirname(self.value[1])),
defaultFile = os.path.basename(self.value[1]))
if dlg.ShowModal() == wxID_OK:
# Get common part of selected path and current
if g.frame.dataFile:
curpath = os.path.abspath(g.frame.dataFile)
else:
curpath = os.path.join(os.getcwd(), '')
common = os.path.commonprefix([curpath, dlg.GetPath()])
self.SetValue(['', dlg.GetPath()[len(common):]])
self.SetModified()
self.textModified = False
dlg.Destroy()
paramDict = {
'flag': ParamFlag,
'style': ParamStyle, 'exstyle': ParamExStyle,
'pos': ParamPosSize, 'size': ParamPosSize,
'cellpos': ParamPosSize, 'cellspan': ParamPosSize,
'border': ParamUnit, 'cols': ParamInt, 'rows': ParamInt,
'vgap': ParamUnit, 'hgap': ParamUnit,
'checkable': ParamBool, 'checked': ParamBool, 'radio': ParamBool,
'accel': ParamAccel,
'label': ParamMultilineText, 'title': ParamText, 'value': ParamText,
'content': ParamContent, 'selection': ParamInt,
'min': ParamInt, 'max': ParamInt,
'fg': ParamColour, 'bg': ParamColour, 'font': ParamFont,
'enabled': ParamBool, 'focused': ParamBool, 'hidden': ParamBool,
'tooltip': ParamText, 'bitmap': ParamBitmap, 'icon': ParamBitmap,
'encoding': ParamEncoding
}

View File

@@ -1,24 +0,0 @@
(require 'sawmill-defaults)
;;; Define two hooks to reset focus behavior while mapping test window
(define (xrced-match-window-before w)
(setq prop (aref (get-x-text-property w 'WM_CLASS) 0))
(cond ((equal prop "_XRCED_T_W")
(setq transients-get-focus-b transients-get-focus)
(setq transients-get-focus nil)
(setq focus-windows-when-mapped-b focus-windows-when-mapped)
(setq focus-windows-when-mapped nil)
)
)
)
(define (xrced-match-window-after w)
(setq prop (aref (get-x-text-property w 'WM_CLASS) 0))
(cond ((equal prop "_XRCED_T_W")
(setq transients-get-focus-b transients-get-focus-b)
(setq focus-windows-when-mapped focus-windows-when-mapped-b)
)
)
)
(add-hook 'map-notify-hook xrced-match-window-before)
(add-hook 'map-notify-hook xrced-match-window-after 't)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

View File

@@ -1,285 +0,0 @@
# Name: tools.py
# Purpose: XRC editor, toolbar
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 19.03.2003
# RCS-ID: $Id$
from xxx import * # xxx imports globals and params
from tree import ID_NEW
# Icons
import images
# Groups of controls
GROUPNUM = 4
GROUP_WINDOWS, GROUP_MENUS, GROUP_SIZERS, GROUP_CONTROLS = range(GROUPNUM)
# States depending on current selection and Control/Shift keys
STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_ELSE = range(5)
# Left toolbar for GUI elements
class Tools(wxPanel):
TOOL_SIZE = (30, 30)
def __init__(self, parent):
if wxPlatform == '__WXGTK__':
wxPanel.__init__(self, parent, -1,
style=wxRAISED_BORDER|wxWANTS_CHARS)
else:
wxPanel.__init__(self, parent, -1, style=wxWANTS_CHARS)
# Create sizer for groups
self.sizer = wxBoxSizer(wxVERTICAL)
# Data to create buttons
pullDownMenu = g.pullDownMenu
self.groups = []
self.ctrl = self.shift = False
# Current state (what to enable/disable)
self.state = None
groups = [
["Windows",
(ID_NEW.FRAME, images.getToolFrameBitmap()),
(ID_NEW.DIALOG, images.getToolDialogBitmap()),
(ID_NEW.PANEL, images.getToolPanelBitmap())],
["Menus",
(ID_NEW.TOOL_BAR, images.getToolToolBarBitmap()),
(ID_NEW.MENU_BAR, images.getToolMenuBarBitmap()),
(ID_NEW.MENU, images.getToolMenuBitmap()),
(ID_NEW.TOOL, images.getToolToolBitmap()),
(ID_NEW.MENU_ITEM, images.getToolMenuItemBitmap()),
(ID_NEW.SEPARATOR, images.getToolSeparatorBitmap())],
["Sizers",
(ID_NEW.BOX_SIZER, images.getToolBoxSizerBitmap()),
(ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
(ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
(ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),
(ID_NEW.GRID_BAG_SIZER, images.getToolGridBagSizerBitmap()),
(ID_NEW.SPACER, images.getToolSpacerBitmap())],
["Controls",
(ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),
(ID_NEW.STATIC_BITMAP, images.getToolStaticBitmapBitmap()),
(ID_NEW.STATIC_LINE, images.getToolStaticLineBitmap()),
(ID_NEW.BUTTON, images.getToolButtonBitmap()),
(ID_NEW.BITMAP_BUTTON, images.getToolBitmapButtonBitmap()),
(ID_NEW.STATIC_BOX, images.getToolStaticBoxBitmap()),
(ID_NEW.TEXT_CTRL, images.getToolTextCtrlBitmap()),
(ID_NEW.COMBO_BOX, images.getToolComboBoxBitmap()),
(ID_NEW.CHOICE, images.getToolChoiceBitmap()),
(ID_NEW.RADIO_BUTTON, images.getToolRadioButtonBitmap()),
(ID_NEW.CHECK_BOX, images.getToolCheckBoxBitmap()),
(ID_NEW.RADIO_BOX, images.getToolRadioBoxBitmap()),
(ID_NEW.SPIN_CTRL, images.getToolSpinCtrlBitmap()),
(ID_NEW.SPIN_BUTTON, images.getToolSpinButtonBitmap()),
(ID_NEW.SCROLL_BAR, images.getToolScrollBarBitmap()),
(ID_NEW.SLIDER, images.getToolSliderBitmap()),
(ID_NEW.GAUGE, images.getToolGaugeBitmap()),
(ID_NEW.TREE_CTRL, images.getToolTreeCtrlBitmap()),
(ID_NEW.LIST_BOX, images.getToolListBoxBitmap()),
(ID_NEW.CHECK_LIST, images.getToolCheckListBitmap()),
(ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
(ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),
(ID_NEW.SPLITTER_WINDOW, images.getToolSplitterWindowBitmap()),
(ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
]
for grp in groups:
self.AddGroup(grp[0])
for b in grp[1:]:
self.AddButton(b[0], b[1], g.pullDownMenu.createMap[b[0]])
self.SetAutoLayout(True)
self.SetSizerAndFit(self.sizer)
# Allow to be resized in vertical direction only
self.SetSizeHints(self.GetSize()[0], -1)
# Events
EVT_COMMAND_RANGE(self, ID_NEW.PANEL, ID_NEW.LAST,
wxEVT_COMMAND_BUTTON_CLICKED, g.frame.OnCreate)
EVT_KEY_DOWN(self, self.OnKeyDown)
EVT_KEY_UP(self, self.OnKeyUp)
def AddButton(self, id, image, text):
from wxPython.lib import buttons
button = buttons.wxGenBitmapButton(self, id, image, size=self.TOOL_SIZE,
style=wxNO_BORDER|wxWANTS_CHARS)
button.SetBezelWidth(0)
EVT_KEY_DOWN(button, self.OnKeyDown)
EVT_KEY_UP(button, self.OnKeyUp)
button.SetToolTipString(text)
self.curSizer.Add(button)
self.groups[-1][1][id] = button
def AddGroup(self, name):
# Each group is inside box
box = wxStaticBox(self, -1, name, style=wxWANTS_CHARS)
box.SetFont(g.smallerFont())
boxSizer = wxStaticBoxSizer(box, wxVERTICAL)
boxSizer.Add((0, 4))
self.curSizer = wxGridSizer(0, 3)
boxSizer.Add(self.curSizer)
self.sizer.Add(boxSizer, 0, wxTOP | wxLEFT | wxRIGHT, 4)
self.groups.append((box,{}))
# Enable/disable group
def EnableGroup(self, gnum, enable = True):
grp = self.groups[gnum]
grp[0].Enable(enable)
for b in grp[1].values(): b.Enable(enable)
# Enable/disable group item
def EnableGroupItem(self, gnum, id, enable = True):
grp = self.groups[gnum]
grp[1][id].Enable(enable)
# Enable/disable group items
def EnableGroupItems(self, gnum, ids, enable = True):
grp = self.groups[gnum]
for id in ids:
grp[1][id].Enable(enable)
# Process key events
def OnKeyDown(self, evt):
if evt.GetKeyCode() == WXK_CONTROL:
g.tree.ctrl = True
elif evt.GetKeyCode() == WXK_SHIFT:
g.tree.shift = True
self.UpdateIfNeeded()
evt.Skip()
def OnKeyUp(self, evt):
if evt.GetKeyCode() == WXK_CONTROL:
g.tree.ctrl = False
elif evt.GetKeyCode() == WXK_SHIFT:
g.tree.shift = False
self.UpdateIfNeeded()
evt.Skip()
def OnMouse(self, evt):
# Update control and shift states
g.tree.ctrl = evt.ControlDown()
g.tree.shift = evt.ShiftDown()
self.UpdateIfNeeded()
evt.Skip()
# Update UI after key presses, if necessary
def UpdateIfNeeded(self):
tree = g.tree
if self.ctrl != tree.ctrl or self.shift != tree.shift:
# Enabling is needed only for ctrl
if self.ctrl != tree.ctrl: self.UpdateUI()
self.ctrl = tree.ctrl
self.shift = tree.shift
if tree.ctrl:
status = 'SBL'
elif tree.shift:
status = 'INS'
else:
status = ''
g.frame.SetStatusText(status, 1)
# Update interface
def UpdateUI(self):
if not self.IsShown(): return
# Update status bar
pullDownMenu = g.pullDownMenu
tree = g.tree
item = tree.selection
# If nothing selected, disable everything and return
if not item:
# Disable everything
for grp in range(GROUPNUM):
self.EnableGroup(grp, False)
self.state = None
return
if tree.ctrl: needInsert = True
else: needInsert = tree.NeedInsert(item)
# Enable depending on selection
if item == tree.root or needInsert and tree.GetItemParent(item) == tree.root:
state = STATE_ROOT
else:
xxx = tree.GetPyData(item).treeObject()
# Check parent for possible child nodes if inserting sibling
if needInsert: xxx = xxx.parent
if xxx.__class__ == xxxMenuBar:
state = STATE_MENUBAR
elif xxx.__class__ in [xxxToolBar, xxxTool] or \
xxx.__class__ == xxxSeparator and xxx.parent.__class__ == xxxToolBar:
state = STATE_TOOLBAR
elif xxx.__class__ in [xxxMenu, xxxMenuItem]:
state = STATE_MENU
else:
state = STATE_ELSE
# Enable depending on selection
if state != self.state:
# Disable everything
for grp in range(GROUPNUM):
self.EnableGroup(grp, False)
# Enable some
if state == STATE_ROOT:
self.EnableGroup(GROUP_WINDOWS, True)
self.EnableGroup(GROUP_MENUS, True)
# But disable items
self.EnableGroupItems(GROUP_MENUS,
[ ID_NEW.TOOL,
ID_NEW.MENU_ITEM,
ID_NEW.SEPARATOR ],
False)
elif state == STATE_MENUBAR:
self.EnableGroup(GROUP_MENUS)
self.EnableGroupItems(GROUP_MENUS,
[ ID_NEW.TOOL_BAR,
ID_NEW.MENU_BAR,
ID_NEW.TOOL ],
False)
elif state == STATE_TOOLBAR:
self.EnableGroup(GROUP_MENUS)
self.EnableGroupItems(GROUP_MENUS,
[ ID_NEW.TOOL_BAR,
ID_NEW.MENU,
ID_NEW.MENU_BAR,
ID_NEW.MENU_ITEM ],
False)
self.EnableGroup(GROUP_CONTROLS)
self.EnableGroupItems(GROUP_CONTROLS,
[ ID_NEW.TREE_CTRL,
ID_NEW.NOTEBOOK,
ID_NEW.SPLITTER_WINDOW ],
False)
elif state == STATE_MENU:
self.EnableGroup(GROUP_MENUS)
self.EnableGroupItems(GROUP_MENUS,
[ ID_NEW.TOOL_BAR,
ID_NEW.MENU_BAR,
ID_NEW.TOOL ],
False)
else:
self.EnableGroup(GROUP_WINDOWS)
self.EnableGroupItems(GROUP_WINDOWS,
[ ID_NEW.FRAME,
ID_NEW.DIALOG ],
False)
self.EnableGroup(GROUP_MENUS)
self.EnableGroupItems(GROUP_MENUS,
[ ID_NEW.MENU_BAR,
ID_NEW.MENU_BAR,
ID_NEW.MENU,
ID_NEW.MENU_ITEM,
ID_NEW.TOOL,
ID_NEW.SEPARATOR ],
False)
self.EnableGroup(GROUP_SIZERS)
self.EnableGroup(GROUP_CONTROLS)
# Special case for notebook (always executed)
if state == STATE_ELSE:
if xxx.__class__ == xxxNotebook:
self.EnableGroup(GROUP_SIZERS, False)
else:
self.EnableGroup(GROUP_SIZERS)
if not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
self.EnableGroupItem(GROUP_SIZERS, ID_NEW.SPACER, False)
# Save state
self.state = state

File diff suppressed because it is too large Load Diff

View File

@@ -1,151 +0,0 @@
# Name: undo.py
# Purpose: XRC editor, undo/redo module
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 01.12.2002
# RCS-ID: $Id$
from globals import *
#from panel import *
# Undo/redo classes
class UndoManager:
# Undo/redo stacks
undo = []
redo = []
def RegisterUndo(self, undoObj):
self.undo.append(undoObj)
for i in self.redo: i.destroy()
self.redo = []
def Undo(self):
undoObj = self.undo.pop()
undoObj.undo()
self.redo.append(undoObj)
g.frame.modified = True
g.frame.SetStatusText('Undone')
def Redo(self):
undoObj = self.redo.pop()
undoObj.redo()
self.undo.append(undoObj)
g.frame.modified = True
g.frame.SetStatusText('Redone')
def Clear(self):
for i in self.undo: i.destroy()
self.undo = []
for i in self.redo: i.destroy()
self.redo = []
def CanUndo(self):
return not not self.undo
def CanRedo(self):
return not not self.redo
class UndoCutDelete:
def __init__(self, itemIndex, parent, elem):
self.itemIndex = itemIndex
self.parent = parent
self.elem = elem
def destroy(self):
if self.elem: self.elem.unlink()
def undo(self):
item = g.tree.InsertNode(g.tree.ItemAtFullIndex(self.itemIndex[:-1]),
self.parent, self.elem,
g.tree.ItemAtFullIndex(self.itemIndex))
# Scroll to show new item (!!! redundant?)
g.tree.EnsureVisible(item)
g.tree.SelectItem(item)
self.elem = None
# Update testWin if needed
if g.testWin and g.tree.IsHighlatable(item):
if g.conf.autoRefresh:
g.tree.needUpdate = True
g.tree.pendingHighLight = item
else:
g.tree.pendingHighLight = None
def redo(self):
item = g.tree.ItemAtFullIndex(self.itemIndex)
# Delete testWin?
if g.testWin:
# If deleting top-level item, delete testWin
if item == g.testWin.item:
g.testWin.Destroy()
g.testWin = None
else:
# Remove highlight, update testWin
if g.testWin.highLight:
g.testWin.highLight.Remove()
g.tree.needUpdate = True
self.elem = g.tree.RemoveLeaf(item)
g.tree.Unselect()
g.panel.Clear()
class UndoPasteCreate:
def __init__(self, itemParent, parent, item, selected):
self.itemParentIndex = g.tree.ItemFullIndex(itemParent)
self.parent = parent
self.itemIndex = g.tree.ItemFullIndex(item) # pasted item
self.selectedIndex = g.tree.ItemFullIndex(selected) # maybe different from item
self.elem = None
def destroy(self):
if self.elem: self.elem.unlink()
def undo(self):
self.elem = g.tree.RemoveLeaf(g.tree.ItemAtFullIndex(self.itemIndex))
# Restore old selection
selected = g.tree.ItemAtFullIndex(self.selectedIndex)
g.tree.EnsureVisible(selected)
g.tree.SelectItem(selected)
# Delete testWin?
if g.testWin:
# If deleting top-level item, delete testWin
if selected == g.testWin.item:
g.testWin.Destroy()
g.testWin = None
else:
# Remove highlight, update testWin
if g.testWin.highLight:
g.testWin.highLight.Remove()
g.tree.needUpdate = True
def redo(self):
item = g.tree.InsertNode(g.tree.ItemAtFullIndex(self.itemParentIndex),
self.parent, self.elem,
g.tree.ItemAtFullIndex(self.itemIndex))
# Scroll to show new item
g.tree.EnsureVisible(item)
g.tree.SelectItem(item)
self.elem = None
# Update testWin if needed
if g.testWin and g.tree.IsHighlatable(item):
if g.conf.autoRefresh:
g.tree.needUpdate = True
g.tree.pendingHighLight = item
else:
g.tree.pendingHighLight = None
class UndoEdit:
def __init__(self):
self.pages = map(ParamPage.GetState, g.panel.pages)
self.selectedIndex = g.tree.ItemFullIndex(g.tree.GetSelection())
def destroy(self):
pass
# Update test view
def update(self, selected):
g.tree.Apply(g.tree.GetPyData(selected), selected)
# Update view
if g.testWin:
if g.testWin.highLight:
g.testWin.highLight.Remove()
g.tree.pendingHighLight = selected
if g.testWin:
g.tree.needUpdate = True
def undo(self):
# Restore selection
selected = g.tree.ItemAtFullIndex(self.selectedIndex)
if selected != g.tree.GetSelection():
g.tree.SelectItem(selected)
# Save current state for redo
map(ParamPage.SaveState, g.panel.pages)
pages = map(ParamPage.GetState, g.panel.pages)
map(ParamPage.SetState, g.panel.pages, self.pages)
self.pages = pages
self.update(selected)
def redo(self):
self.undo()
self.update(g.tree.GetSelection())

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1 +0,0 @@
python2.2 YOUR_PATH_TO_XRCED/xrced.py $*

View File

@@ -1,434 +0,0 @@
<?xml version="1.0"?>
<resource>
<object class="wxDialog" name="DIALOG_TEXT">
<title>Text Dialog</title>
<centered>1</centered>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxTextCtrl" name="TEXT">
<size>250,100</size>
<style>wxTE_MULTILINE</style>
</object>
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxStaticLine"/>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxRIGHT</flag>
<border>10</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
</object>
<style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
</object>
<object class="wxDialog" name="DIALOG_CONTENT">
<title>Content</title>
<centered>1</centered>
<size>250,300</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxListBox" name="LIST">
<content/>
</object>
<option>1</option>
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_UP">
<label>Move Up</label>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_DOWN">
<label>Move Down</label>
</object>
<flag>wxEXPAND</flag>
</object>
<object class="spacer">
<size>10,20</size>
<option>1</option>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_APPEND">
<label>Append...</label>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_REMOVE">
<label>Remove</label>
</object>
<flag>wxEXPAND</flag>
</object>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxStaticLine"/>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxRIGHT</flag>
<border>10</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
</object>
<style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
</object>
<object class="wxDialog" name="DIALOG_CONTENT_CHECK_LIST">
<title>Content</title>
<centered>1</centered>
<size>250,300</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxCheckListBox" name="CHECK_LIST">
<content/>
</object>
<option>1</option>
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_UP">
<label>Move Up</label>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_DOWN">
<label>Move Down</label>
</object>
<flag>wxEXPAND</flag>
</object>
<object class="spacer">
<size>10,20</size>
<option>1</option>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_APPEND">
<label>Append...</label>
</object>
<flag>wxBOTTOM|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_REMOVE">
<label>Remove</label>
</object>
<flag>wxEXPAND</flag>
</object>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxStaticLine"/>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxRIGHT</flag>
<border>10</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
</object>
<style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
</object>
<object class="wxDialog" name="DIALOG_CHOICES">
<title>Choices</title>
<centered>1</centered>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckListBox" name="CHECK_LIST">
<content/>
<size>250,250</size>
<style></style>
</object>
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxStaticLine"/>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxRIGHT</flag>
<border>10</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
</object>
<style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
</object>
<object class="wxDialog" name="DIALOG_INTLIST">
<title>Numbers</title>
<centered>1</centered>
<size>100,300</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxListBox" name="LIST">
<content/>
<size>80,100</size>
<style>wxLB_SORT</style>
</object>
<option>1</option>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_ADD">
<label>Add...</label>
</object>
<flag>wxBOTTOM</flag>
<border>3</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_REMOVE">
<label>Remove</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>5</border>
</object>
</object>
<option>1</option>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxStaticLine"/>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxBOTTOM</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
</object>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
<border>10</border>
</object>
</object>
<style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
</object>
<object class="wxPanel" name="PANEL_BITMAP">
<object class="wxStaticBoxSizer">
<label></label>
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>2</rows>
<object class="sizeritem">
<object class="wxRadioButton" name="RADIO_STD">
<label>art:</label>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxComboBox" name="COMBO_STD">
<content>
<item>wxART_ADD_BOOKMARK</item>
<item>wxART_DEL_BOOKMARK</item>
<item>wxART_HELP_SIDE_PANEL</item>
<item>wxART_HELP_SETTINGS</item>
<item>wxART_HELP_BOOK</item>
<item>wxART_HELP_FOLDER</item>
<item>wxART_HELP_PAGE</item>
<item>wxART_GO_BACK</item>
<item>wxART_GO_FORWARD</item>
<item>wxART_GO_UP</item>
<item>wxART_GO_DOWN</item>
<item>wxART_GO_TO_PARENT</item>
<item>wxART_GO_HOME</item>
<item>wxART_FILE_OPEN</item>
<item>wxART_FILE_SAVE</item>
<item>wxART_FILE_SAVE_AS</item>
<item>wxART_PRINT</item>
<item>wxART_HELP</item>
<item>wxART_TIP</item>
<item>wxART_REPORT_VIEW</item>
<item>wxART_LIST_VIEW</item>
<item>wxART_NEW_DIR</item>
<item>wxART_HARDDISK</item>
<item>wxART_FLOPPY</item>
<item>wxART_CDROM</item>
<item>wxART_REMOVABLE</item>
<item>wxART_FOLDER</item>
<item>wxART_FOLDER_OPEN</item>
<item>wxART_GO_DIR_UP</item>
<item>wxART_EXECUTABLE_FILE</item>
<item>wxART_NORMAL_FILE</item>
<item>wxART_TICK_MARK</item>
<item>wxART_CROSS_MARK</item>
<item>wxART_ERROR</item>
<item>wxART_QUESTION</item>
<item>wxART_WARNING</item>
<item>wxART_INFORMATION</item>
<item>wxART_MISSING_IMAGE</item>
<item>wxART_COPY</item>
<item>wxART_CUT</item>
<item>wxART_PASTE</item>
<item>wxART_DELETE</item>
<item>wxART_NEW</item>
<item>wxART_UNDO</item>
<item>wxART_REDO</item>
<item>wxART_QUIT</item>
<item>wxART_FIND</item>
<item>wxART_FIND_AND_REPLACE</item>
</content>
</object>
<flag>wxRIGHT|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxRadioButton" name="RADIO_FILE">
<label>file:</label>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxTextCtrl" name="TEXT_FILE"/>
<option>1</option>
<flag>wxRIGHT|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BUTTON_BROWSE">
<label>Browse...</label>
<size>40,-1d</size>
</object>
</object>
</object>
<flag>wxRIGHT|wxEXPAND</flag>
<border>5</border>
</object>
<vgap>2</vgap>
<growablecols>1</growablecols>
</object>
<flag>wxEXPAND</flag>
</object>
</object>
</object>
</resource>

View File

@@ -1,937 +0,0 @@
# Name: xxx.py ('xxx' is easy to distinguish from 'wx' :) )
# Purpose: XML interface classes
# Author: Roman Rolinsky <rolinsky@mema.ucl.ac.be>
# Created: 22.08.2001
# RCS-ID: $Id$
from xml.dom import minidom
from globals import *
from params import *
# Base class for interface parameter classes
class xxxNode:
def __init__(self, node):
self.node = node
def remove(self):
self.node.parentNode.removeChild(self.node)
self.node.unlink()
# Generic (text) parameter class
class xxxParam(xxxNode):
# Standard use: for text nodes
def __init__(self, node):
xxxNode.__init__(self, node)
if not node.hasChildNodes():
# If does not have child nodes, create empty text node
text = g.tree.dom.createTextNode('')
node.appendChild(text)
else:
text = node.childNodes[0] # first child must be text node
assert text.nodeType == minidom.Node.TEXT_NODE
# Append other text nodes if present and delete them
extraText = ''
for n in node.childNodes[1:]:
if n.nodeType == minidom.Node.TEXT_NODE:
extraText += n.data
node.removeChild(n)
n.unlink()
else: break
if extraText: text.data = text.data + extraText
# Use convertion from unicode to current encoding
self.textNode = text
# Value returns string
if wxUSE_UNICODE: # no conversion is needed
def value(self):
return self.textNode.data
def update(self, value):
self.textNode.data = value
else:
def value(self):
try:
return self.textNode.data.encode(g.currentEncoding)
except LookupError:
return self.textNode.data.encode()
def update(self, value):
try: # handle exception if encoding is wrong
self.textNode.data = unicode(value, g.currentEncoding)
except UnicodeDecodeError:
self.textNode.data = unicode(value)
#wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
# Integer parameter
class xxxParamInt(xxxParam):
# Standard use: for text nodes
def __init__(self, node):
xxxParam.__init__(self, node)
# Value returns string
def value(self):
try:
return int(self.textNode.data)
except ValueError:
return -1 # invalid value
def update(self, value):
self.textNode.data = str(value)
# Content parameter
class xxxParamContent(xxxNode):
def __init__(self, node):
xxxNode.__init__(self, node)
data, l = [], [] # data is needed to quicker value retrieval
nodes = node.childNodes[:] # make a copy of the child list
for n in nodes:
if n.nodeType == minidom.Node.ELEMENT_NODE:
assert n.tagName == 'item', 'bad content content'
if not n.hasChildNodes():
# If does not have child nodes, create empty text node
text = g.tree.dom.createTextNode('')
node.appendChild(text)
else:
# !!! normalize?
text = n.childNodes[0] # first child must be text node
assert text.nodeType == minidom.Node.TEXT_NODE
l.append(text)
data.append(str(text.data))
else: # remove other
node.removeChild(n)
n.unlink()
self.l, self.data = l, data
def value(self):
return self.data
def update(self, value):
# If number if items is not the same, recreate children
if len(value) != len(self.l): # remove first if number of items has changed
childNodes = self.node.childNodes[:]
for n in childNodes:
self.node.removeChild(n)
l = []
for str in value:
itemElem = g.tree.dom.createElement('item')
itemText = g.tree.dom.createTextNode(str)
itemElem.appendChild(itemText)
self.node.appendChild(itemElem)
l.append(itemText)
self.l = l
else:
for i in range(len(value)):
self.l[i].data = value[i]
self.data = value
# Content parameter for checklist
class xxxParamContentCheckList(xxxNode):
def __init__(self, node):
xxxNode.__init__(self, node)
data, l = [], [] # data is needed to quicker value retrieval
nodes = node.childNodes[:] # make a copy of the child list
for n in nodes:
if n.nodeType == minidom.Node.ELEMENT_NODE:
assert n.tagName == 'item', 'bad content content'
checked = n.getAttribute('checked')
if not checked: checked = 0
if not n.hasChildNodes():
# If does not have child nodes, create empty text node
text = g.tree.dom.createTextNode('')
node.appendChild(text)
else:
# !!! normalize?
text = n.childNodes[0] # first child must be text node
assert text.nodeType == minidom.Node.TEXT_NODE
l.append((text, n))
data.append((str(text.data), int(checked)))
else: # remove other
node.removeChild(n)
n.unlink()
self.l, self.data = l, data
def value(self):
return self.data
def update(self, value):
# If number if items is not the same, recreate children
if len(value) != len(self.l): # remove first if number of items has changed
childNodes = self.node.childNodes[:]
for n in childNodes:
self.node.removeChild(n)
l = []
for s,ch in value:
itemElem = g.tree.dom.createElement('item')
# Add checked only if True
if ch: itemElem.setAttribute('checked', '1')
itemText = g.tree.dom.createTextNode(s)
itemElem.appendChild(itemText)
self.node.appendChild(itemElem)
l.append((itemText, itemElem))
self.l = l
else:
for i in range(len(value)):
self.l[i][0].data = value[i][0]
self.l[i][1].setAttribute('checked', str(value[i][1]))
self.data = value
# Bitmap parameter
class xxxParamBitmap(xxxParam):
def __init__(self, node):
xxxParam.__init__(self, node)
self.stock_id = node.getAttribute('stock_id')
def value(self):
return [self.stock_id, xxxParam.value(self)]
def update(self, value):
self.stock_id = value[0]
if self.stock_id:
self.node.setAttribute('stock_id', self.stock_id)
elif self.node.hasAttribute('stock_id'):
self.node.removeAttribute('stock_id')
xxxParam.update(self, value[1])
################################################################################
# Classes to interface DOM objects
class xxxObject:
# Default behavior
hasChildren = False # has children elements?
hasStyle = True # almost everyone
hasName = True # has name attribute?
isSizer = hasChild = False
allParams = None # Some nodes have no parameters
# Style parameters (all optional)
styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'tooltip']
# Special parameters
specials = []
# Bitmap tags
bitmapTags = ['bitmap', 'bitmap2', 'icon']
# Required paremeters: none by default
required = []
# Default parameters with default values
default = {}
# Parameter types
paramDict = {}
# Window styles and extended styles
winStyles = []
# Tree icon index
#image = -1
# Construct a new xxx object from DOM element
# parent is parent xxx object (or None if none), element is DOM element object
def __init__(self, parent, element):
self.parent = parent
self.element = element
self.undo = None
# Get attributes
self.className = element.getAttribute('class')
self.subclass = element.getAttribute('subclass')
if self.hasName: self.name = element.getAttribute('name')
# Set parameters (text element children)
self.params = {}
nodes = element.childNodes[:]
for node in nodes:
if node.nodeType == minidom.Node.ELEMENT_NODE:
tag = node.tagName
if tag == 'object':
continue # do nothing for object children here
if tag not in self.allParams and tag not in self.styles:
print 'WARNING: unknown parameter for %s: %s' % \
(self.className, tag)
elif tag in self.specials:
self.special(tag, node)
elif tag == 'content':
if self.className == 'wxCheckListBox':
self.params[tag] = xxxParamContentCheckList(node)
else:
self.params[tag] = xxxParamContent(node)
elif tag == 'font': # has children
self.params[tag] = xxxParamFont(element, node)
elif tag in self.bitmapTags:
# Can have attributes
self.params[tag] = xxxParamBitmap(node)
else: # simple parameter
self.params[tag] = xxxParam(node)
elif node.nodeType == minidom.Node.TEXT_NODE and node.data.isspace():
# Remove empty text nodes
element.removeChild(node)
node.unlink()
# Check that all required params are set
for param in self.required:
if not self.params.has_key(param):
# If default is specified, set it
if self.default.has_key(param):
elem = g.tree.dom.createElement(param)
if param == 'content':
if self.className == 'wxCheckListBox':
self.params[param] = xxxParamContentCheckList(elem)
else:
self.params[param] = xxxParamContent(elem)
else:
self.params[param] = xxxParam(elem)
# Find place to put new element: first present element after param
found = False
paramStyles = self.allParams + self.styles
for p in paramStyles[paramStyles.index(param) + 1:]:
# Content params don't have same type
if self.params.has_key(p) and p != 'content':
found = True
break
if found:
nextTextElem = self.params[p].node
self.element.insertBefore(elem, nextTextElem)
else:
self.element.appendChild(elem)
else:
wxLogWarning('Required parameter %s of %s missing' %
(param, self.className))
# Returns real tree object
def treeObject(self):
if self.hasChild: return self.child
return self
# Returns tree image index
def treeImage(self):
if self.hasChild: return self.child.treeImage()
return self.image
# Class name plus wx name
def treeName(self):
if self.hasChild: return self.child.treeName()
if self.subclass: className = self.subclass
else: className = self.className
if self.hasName and self.name: return className + ' "' + self.name + '"'
return className
# Class name or subclass
def panelName(self):
if self.subclass: return self.subclass + '(' + self.className + ')'
else: return self.className
# Sets name of tree object
def setTreeName(self, name):
if self.hasChild: obj = self.child
else: obj = self
obj.name = name
obj.element.setAttribute('name', name)
################################################################################
# This is a little special: it is both xxxObject and xxxNode
class xxxParamFont(xxxObject, xxxNode):
allParams = ['size', 'family', 'style', 'weight', 'underlined',
'face', 'encoding']
def __init__(self, parent, element):
xxxObject.__init__(self, parent, element)
xxxNode.__init__(self, element)
self.parentNode = parent # required to behave similar to DOM node
v = []
for p in self.allParams:
try:
v.append(str(self.params[p].value()))
except KeyError:
v.append('')
self.data = v
def update(self, value):
# `value' is a list of strings corresponding to all parameters
elem = self.element
# Remove old elements first
childNodes = elem.childNodes[:]
for node in childNodes: elem.removeChild(node)
i = 0
self.params.clear()
v = []
for param in self.allParams:
if value[i]:
fontElem = g.tree.dom.createElement(param)
textNode = g.tree.dom.createTextNode(value[i])
self.params[param] = textNode
fontElem.appendChild(textNode)
elem.appendChild(fontElem)
v.append(value[i])
i += 1
self.data = v
def value(self):
return self.data
################################################################################
class xxxContainer(xxxObject):
hasChildren = True
exStyles = []
# Simulate normal parameter for encoding
class xxxEncoding:
def value(self):
return g.currentEncoding
def update(self, val):
g.currentEncoding = val
# Special class for root node
class xxxMainNode(xxxContainer):
allParams = ['encoding']
hasStyle = hasName = False
def __init__(self, dom):
xxxContainer.__init__(self, None, dom.documentElement)
self.className = 'XML tree'
# Reset required parameters after processing XML, because encoding is
# a little special
self.required = ['encoding']
self.params['encoding'] = xxxEncoding()
################################################################################
# Top-level windwows
class xxxPanel(xxxContainer):
allParams = ['pos', 'size', 'style']
styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'exstyle',
'tooltip']
class xxxDialog(xxxContainer):
allParams = ['title', 'centered', 'pos', 'size', 'style']
paramDict = {'centered': ParamBool}
required = ['title']
default = {'title': ''}
winStyles = ['wxDEFAULT_DIALOG_STYLE',
'wxCAPTION', 'wxMINIMIZE_BOX', 'wxMAXIMIZE_BOX', 'wxCLOSE_BOX',
'wxSTAY_ON_TOP',
'wxTHICK_FRAME',
'wxNO_3D', 'wxDIALOG_NO_PARENT']
styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'exstyle',
'tooltip']
class xxxFrame(xxxContainer):
allParams = ['title', 'centered', 'pos', 'size', 'style']
paramDict = {'centered': ParamBool}
required = ['title']
default = {'title': ''}
winStyles = ['wxDEFAULT_FRAME_STYLE',
'wxCAPTION', 'wxMINIMIZE_BOX', 'wxMAXIMIZE_BOX', 'wxCLOSE_BOX',
'wxSTAY_ON_TOP',
'wxSYSTEM_MENU', 'wxRESIZE_BORDER',
'wxFRAME_TOOL_WINDOW', 'wxFRAME_NO_TASKBAR',
'wxFRAME_FLOAT_ON_PARENT', 'wxFRAME_SHAPED'
]
styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'exstyle',
'tooltip']
class xxxTool(xxxObject):
allParams = ['bitmap', 'bitmap2', 'radio', 'toggle', 'tooltip', 'longhelp', 'label']
required = ['bitmap']
paramDict = {'bitmap2': ParamBitmap, 'radio': ParamBool, 'toggle': ParamBool}
hasStyle = False
class xxxToolBar(xxxContainer):
allParams = ['bitmapsize', 'margins', 'packing', 'separation', 'dontattachtoframe',
'pos', 'size', 'style']
hasStyle = False
paramDict = {'bitmapsize': ParamPosSize, 'margins': ParamPosSize,
'packing': ParamInt, 'separation': ParamInt,
'dontattachtoframe': ParamBool, 'style': ParamNonGenericStyle}
winStyles = ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_HORIZONTAL',
'wxTB_3DBUTTONS','wxTB_TEXT', 'wxTB_NOICONS', 'wxTB_NODIVIDER',
'wxTB_NOALIGN', 'wxTB_HORZ_LAYOUT', 'wxTB_HORZ_TEXT']
class xxxWizard(xxxContainer):
allParams = ['title', 'bitmap', 'pos']
required = ['title']
default = {'title': ''}
winStyles = []
exStyles = ['wxWIZARD_EX_HELPBUTTON']
class xxxWizardPage(xxxContainer):
allParams = ['bitmap']
winStyles = []
exStyles = []
class xxxWizardPageSimple(xxxContainer):
allParams = ['bitmap']
winStyles = []
exStyles = []
################################################################################
# Bitmap, Icon
class xxxBitmap(xxxObject):
allParams = ['bitmap']
required = ['bitmap']
# Just like bitmap
class xxxIcon(xxxObject):
allParams = []
################################################################################
# Controls
class xxxStaticText(xxxObject):
allParams = ['label', 'pos', 'size', 'style']
required = ['label']
default = {'label': ''}
winStyles = ['wxALIGN_LEFT', 'wxALIGN_RIGHT', 'wxALIGN_CENTRE', 'wxST_NO_AUTORESIZE']
class xxxStaticLine(xxxObject):
allParams = ['pos', 'size', 'style']
winStyles = ['wxLI_HORIZONTAL', 'wxLI_VERTICAL']
class xxxStaticBitmap(xxxObject):
allParams = ['bitmap', 'pos', 'size', 'style']
required = ['bitmap']
class xxxTextCtrl(xxxObject):
allParams = ['value', 'pos', 'size', 'style']
winStyles = ['wxTE_PROCESS_ENTER', 'wxTE_PROCESS_TAB', 'wxTE_MULTILINE',
'wxTE_PASSWORD', 'wxTE_READONLY', 'wxHSCROLL']
paramDict = {'value': ParamMultilineText}
class xxxChoice(xxxObject):
allParams = ['content', 'selection', 'pos', 'size', 'style']
required = ['content']
default = {'content': '[]'}
winStyles = ['wxCB_SORT']
class xxxSlider(xxxObject):
allParams = ['value', 'min', 'max', 'pos', 'size', 'style',
'tickfreq', 'pagesize', 'linesize', 'thumb', 'tick',
'selmin', 'selmax']
paramDict = {'value': ParamInt, 'tickfreq': ParamInt, 'pagesize': ParamInt,
'linesize': ParamInt, 'thumb': ParamInt, 'thumb': ParamInt,
'tick': ParamInt, 'selmin': ParamInt, 'selmax': ParamInt}
required = ['value', 'min', 'max']
winStyles = ['wxSL_HORIZONTAL', 'wxSL_VERTICAL', 'wxSL_AUTOTICKS', 'wxSL_LABELS',
'wxSL_LEFT', 'wxSL_RIGHT', 'wxSL_TOP', 'wxSL_BOTTOM',
'wxSL_BOTH', 'wxSL_SELRANGE', 'wxSL_INVERSE']
class xxxGauge(xxxObject):
allParams = ['range', 'pos', 'size', 'style', 'value', 'shadow', 'bezel']
paramDict = {'range': ParamInt, 'value': ParamInt,
'shadow': ParamInt, 'bezel': ParamInt}
winStyles = ['wxGA_HORIZONTAL', 'wxGA_VERTICAL', 'wxGA_PROGRESSBAR', 'wxGA_SMOOTH']
class xxxScrollBar(xxxObject):
allParams = ['pos', 'size', 'style', 'value', 'thumbsize', 'range', 'pagesize']
paramDict = {'value': ParamInt, 'range': ParamInt, 'thumbsize': ParamInt,
'pagesize': ParamInt}
winStyles = ['wxSB_HORIZONTAL', 'wxSB_VERTICAL']
class xxxListCtrl(xxxObject):
allParams = ['pos', 'size', 'style']
winStyles = ['wxLC_LIST', 'wxLC_REPORT', 'wxLC_ICON', 'wxLC_SMALL_ICON',
'wxLC_ALIGN_TOP', 'wxLC_ALIGN_LEFT', 'wxLC_AUTOARRANGE',
'wxLC_USER_TEXT', 'wxLC_EDIT_LABELS', 'wxLC_NO_HEADER',
'wxLC_SINGLE_SEL', 'wxLC_SORT_ASCENDING', 'wxLC_SORT_DESCENDING']
class xxxTreeCtrl(xxxObject):
allParams = ['pos', 'size', 'style']
winStyles = ['wxTR_HAS_BUTTONS', 'wxTR_NO_LINES', 'wxTR_LINES_AT_ROOT',
'wxTR_EDIT_LABELS', 'wxTR_MULTIPLE']
class xxxHtmlWindow(xxxObject):
allParams = ['pos', 'size', 'style', 'borders', 'url', 'htmlcode']
paramDict = {'borders': ParamInt, 'htmlcode':ParamMultilineText}
winStyles = ['wxHW_SCROLLBAR_NEVER', 'wxHW_SCROLLBAR_AUTO']
class xxxCalendarCtrl(xxxObject):
allParams = ['pos', 'size', 'style']
class xxxNotebook(xxxContainer):
allParams = ['usenotebooksizer', 'pos', 'size', 'style']
paramDict = {'usenotebooksizer': ParamBool}
winStyles = ['wxNB_FIXEDWIDTH', 'wxNB_LEFT', 'wxNB_RIGHT', 'wxNB_BOTTOM']
class xxxSplitterWindow(xxxContainer):
allParams = ['orientation', 'sashpos', 'minsize', 'pos', 'size', 'style']
paramDict = {'orientation': ParamOrientation, 'sashpos': ParamUnit, 'minsize': ParamUnit }
winStyles = ['wxSP_3D', 'wxSP_3DSASH', 'wxSP_3DBORDER', 'wxSP_BORDER',
'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE',
'wxSP_NO_XP_THEME' ]
class xxxGenericDirCtrl(xxxObject):
allParams = ['defaultfolder', 'filter', 'defaultfilter', 'pos', 'size', 'style']
paramDict = {'defaultfilter': ParamInt}
winStyles = ['wxDIRCTRL_DIR_ONLY', 'wxDIRCTRL_3D_INTERNAL', 'wxDIRCTRL_SELECT_FIRST',
'wxDIRCTRL_SHOW_FILTERS', 'wxDIRCTRL_EDIT_LABELS']
class xxxScrolledWindow(xxxContainer):
allParams = ['pos', 'size', 'style']
winStyles = ['wxHSCROLL', 'wxVSCROLL']
################################################################################
# Buttons
class xxxButton(xxxObject):
allParams = ['label', 'default', 'pos', 'size', 'style']
paramDict = {'default': ParamBool}
required = ['label']
winStyles = ['wxBU_LEFT', 'wxBU_TOP', 'wxBU_RIGHT', 'wxBU_BOTTOM']
class xxxBitmapButton(xxxObject):
allParams = ['bitmap', 'selected', 'focus', 'disabled', 'default',
'pos', 'size', 'style']
required = ['bitmap']
winStyles = ['wxBU_AUTODRAW', 'wxBU_LEFT', 'wxBU_TOP',
'wxBU_RIGHT', 'wxBU_BOTTOM']
class xxxRadioButton(xxxObject):
allParams = ['label', 'value', 'pos', 'size', 'style']
paramDict = {'value': ParamBool}
required = ['label']
winStyles = ['wxRB_GROUP']
class xxxSpinButton(xxxObject):
allParams = ['value', 'min', 'max', 'pos', 'size', 'style']
paramDict = {'value': ParamInt}
winStyles = ['wxSP_HORIZONTAL', 'wxSP_VERTICAL', 'wxSP_ARROW_KEYS', 'wxSP_WRAP']
class xxxSpinCtrl(xxxObject):
allParams = ['value', 'min', 'max', 'pos', 'size', 'style']
paramDict = {'value': ParamInt}
winStyles = ['wxSP_HORIZONTAL', 'wxSP_VERTICAL', 'wxSP_ARROW_KEYS', 'wxSP_WRAP']
class xxxToggleButton(xxxObject):
allParams = ['label', 'checked', 'pos', 'size', 'style']
paramDict = {'checked': ParamBool}
required = ['label']
################################################################################
# Boxes
class xxxStaticBox(xxxObject):
allParams = ['label', 'pos', 'size', 'style']
required = ['label']
class xxxRadioBox(xxxObject):
allParams = ['label', 'content', 'selection', 'dimension', 'pos', 'size', 'style']
paramDict = {'dimension': ParamInt}
required = ['label', 'content']
default = {'content': '[]'}
winStyles = ['wxRA_SPECIFY_ROWS', 'wxRA_SPECIFY_COLS']
class xxxCheckBox(xxxObject):
allParams = ['label', 'checked', 'pos', 'size', 'style']
paramDict = {'checked': ParamBool}
winStyles = ['wxCHK_2STATE', 'wxCHK_3STATE', 'wxCHK_ALLOW_3RD_STATE_FOR_USER',
'wxALIGN_RIGHT']
required = ['label']
class xxxComboBox(xxxObject):
allParams = ['content', 'selection', 'value', 'pos', 'size', 'style']
required = ['content']
default = {'content': '[]'}
winStyles = ['wxCB_SIMPLE', 'wxCB_SORT', 'wxCB_READONLY', 'wxCB_DROPDOWN']
class xxxListBox(xxxObject):
allParams = ['content', 'selection', 'pos', 'size', 'style']
required = ['content']
default = {'content': '[]'}
winStyles = ['wxLB_SINGLE', 'wxLB_MULTIPLE', 'wxLB_EXTENDED', 'wxLB_HSCROLL',
'wxLB_ALWAYS_SB', 'wxLB_NEEDED_SB', 'wxLB_SORT']
class xxxCheckList(xxxObject):
allParams = ['content', 'pos', 'size', 'style']
required = ['content']
default = {'content': '[]'}
winStyles = ['wxLC_LIST', 'wxLC_REPORT', 'wxLC_ICON', 'wxLC_SMALL_ICON',
'wxLC_ALIGN_TOP', 'wxLC_ALIGN_LEFT', 'wxLC_AUTOARRANGE',
'wxLC_USER_TEXT', 'wxLC_EDIT_LABELS', 'wxLC_NO_HEADER',
'wxLC_SINGLE_SEL', 'wxLC_SORT_ASCENDING', 'wxLC_SORT_DESCENDING']
paramDict = {'content': ParamContentCheckList}
################################################################################
# Sizers
class xxxSizer(xxxContainer):
hasName = hasStyle = False
paramDict = {'orient': ParamOrient}
isSizer = True
itemTag = 'sizeritem' # different for some sizers
class xxxBoxSizer(xxxSizer):
allParams = ['orient']
required = ['orient']
default = {'orient': 'wxVERTICAL'}
# Tree icon depends on orientation
def treeImage(self):
if self.params['orient'].value() == 'wxHORIZONTAL': return self.imageH
else: return self.imageV
class xxxStaticBoxSizer(xxxBoxSizer):
allParams = ['label', 'orient']
required = ['label', 'orient']
class xxxGridSizer(xxxSizer):
allParams = ['cols', 'rows', 'vgap', 'hgap']
required = ['cols']
default = {'cols': '2', 'rows': '2'}
class xxxStdDialogButtonSizer(xxxSizer):
allParams = []
itemTag = 'button'
# For repeated parameters
class xxxParamMulti:
def __init__(self, node):
self.node = node
self.l, self.data = [], []
def append(self, param):
self.l.append(param)
self.data.append(param.value())
def value(self):
return self.data
def remove(self):
for param in self.l:
param.remove()
self.l, self.data = [], []
class xxxFlexGridSizer(xxxGridSizer):
specials = ['growablecols', 'growablerows']
allParams = ['cols', 'rows', 'vgap', 'hgap'] + specials
paramDict = {'growablecols':ParamIntList, 'growablerows':ParamIntList}
# Special processing for growable* parameters
# (they are represented by several nodes)
def special(self, tag, node):
if not self.params.has_key(tag):
# Create new multi-group
self.params[tag] = xxxParamMulti(node)
self.params[tag].append(xxxParamInt(node))
def setSpecial(self, param, value):
# Straightforward implementation: remove, add again
self.params[param].remove()
del self.params[param]
for i in value:
node = g.tree.dom.createElement(param)
text = g.tree.dom.createTextNode(str(i))
node.appendChild(text)
self.element.appendChild(node)
self.special(param, node)
class xxxGridBagSizer(xxxSizer):
specials = ['growablecols', 'growablerows']
allParams = ['vgap', 'hgap'] + specials
paramDict = {'growablecols':ParamIntList, 'growablerows':ParamIntList}
# Special processing for growable* parameters
# (they are represented by several nodes)
def special(self, tag, node):
if not self.params.has_key(tag):
# Create new multi-group
self.params[tag] = xxxParamMulti(node)
self.params[tag].append(xxxParamInt(node))
def setSpecial(self, param, value):
# Straightforward implementation: remove, add again
self.params[param].remove()
del self.params[param]
for i in value:
node = g.tree.dom.createElement(param)
text = g.tree.dom.createTextNode(str(i))
node.appendChild(text)
self.element.appendChild(node)
self.special(param, node)
# Container with only one child.
# Not shown in tree.
class xxxChildContainer(xxxObject):
hasName = hasStyle = False
hasChild = True
def __init__(self, parent, element):
xxxObject.__init__(self, parent, element)
# Must have one child with 'object' tag, but we don't check it
nodes = element.childNodes[:] # create copy
for node in nodes:
if node.nodeType == minidom.Node.ELEMENT_NODE:
if node.tagName == 'object':
# Create new xxx object for child node
self.child = MakeXXXFromDOM(self, node)
self.child.parent = parent
# Copy hasChildren and isSizer attributes
self.hasChildren = self.child.hasChildren
self.isSizer = self.child.isSizer
return # success
else:
element.removeChild(node)
node.unlink()
assert 0, 'no child found'
class xxxSizerItem(xxxChildContainer):
allParams = ['option', 'flag', 'border', 'minsize', 'ratio']
paramDict = {'option': ParamInt, 'minsize': ParamPosSize, 'ratio': ParamPosSize}
#default = {'cellspan': '1,1'}
def __init__(self, parent, element):
# For GridBag sizer items, extra parameters added
if isinstance(parent, xxxGridBagSizer):
self.allParams = self.allParams + ['cellpos', 'cellspan']
xxxChildContainer.__init__(self, parent, element)
# Remove pos parameter - not needed for sizeritems
if 'pos' in self.child.allParams:
self.child.allParams = self.child.allParams[:]
self.child.allParams.remove('pos')
class xxxSizerItemButton(xxxSizerItem):
allParams = []
paramDict = {}
def __init__(self, parent, element):
xxxChildContainer.__init__(self, parent, element)
# Remove pos parameter - not needed for sizeritems
if 'pos' in self.child.allParams:
self.child.allParams = self.child.allParams[:]
self.child.allParams.remove('pos')
class xxxNotebookPage(xxxChildContainer):
allParams = ['label', 'selected']
paramDict = {'selected': ParamBool}
required = ['label']
def __init__(self, parent, element):
xxxChildContainer.__init__(self, parent, element)
# pos and size dont matter for notebookpages
if 'pos' in self.child.allParams:
self.child.allParams = self.child.allParams[:]
self.child.allParams.remove('pos')
if 'size' in self.child.allParams:
self.child.allParams = self.child.allParams[:]
self.child.allParams.remove('size')
class xxxSpacer(xxxObject):
hasName = hasStyle = False
allParams = ['size', 'option', 'flag', 'border']
paramDict = {'option': ParamInt}
default = {'size': '0,0'}
class xxxMenuBar(xxxContainer):
allParams = ['style']
paramDict = {'style': ParamNonGenericStyle} # no generic styles
winStyles = ['wxMB_DOCKABLE']
class xxxMenu(xxxContainer):
allParams = ['label', 'help', 'style']
default = {'label': ''}
paramDict = {'style': ParamNonGenericStyle} # no generic styles
winStyles = ['wxMENU_TEAROFF']
class xxxMenuItem(xxxObject):
allParams = ['label', 'bitmap', 'accel', 'help',
'checkable', 'radio', 'enabled', 'checked']
default = {'label': ''}
hasStyle = False
class xxxSeparator(xxxObject):
hasName = hasStyle = False
################################################################################
# Unknown control
class xxxUnknown(xxxObject):
allParams = ['pos', 'size', 'style']
paramDict = {'style': ParamNonGenericStyle} # no generic styles
################################################################################
xxxDict = {
'wxPanel': xxxPanel,
'wxDialog': xxxDialog,
'wxFrame': xxxFrame,
'tool': xxxTool,
'wxToolBar': xxxToolBar,
'wxWizard': xxxWizard,
'wxWizardPage': xxxWizardPage,
'wxWizardPageSimple': xxxWizardPageSimple,
'wxBitmap': xxxBitmap,
'wxIcon': xxxIcon,
'wxButton': xxxButton,
'wxBitmapButton': xxxBitmapButton,
'wxRadioButton': xxxRadioButton,
'wxSpinButton': xxxSpinButton,
'wxToggleButton' : xxxToggleButton,
'wxStaticBox': xxxStaticBox,
'wxStaticBitmap': xxxStaticBitmap,
'wxRadioBox': xxxRadioBox,
'wxComboBox': xxxComboBox,
'wxCheckBox': xxxCheckBox,
'wxListBox': xxxListBox,
'wxStaticText': xxxStaticText,
'wxStaticLine': xxxStaticLine,
'wxTextCtrl': xxxTextCtrl,
'wxChoice': xxxChoice,
'wxSlider': xxxSlider,
'wxGauge': xxxGauge,
'wxScrollBar': xxxScrollBar,
'wxTreeCtrl': xxxTreeCtrl,
'wxListCtrl': xxxListCtrl,
'wxCheckListBox': xxxCheckList,
'wxNotebook': xxxNotebook,
'wxSplitterWindow': xxxSplitterWindow,
'notebookpage': xxxNotebookPage,
'wxHtmlWindow': xxxHtmlWindow,
'wxCalendarCtrl': xxxCalendarCtrl,
'wxGenericDirCtrl': xxxGenericDirCtrl,
'wxSpinCtrl': xxxSpinCtrl,
'wxScrolledWindow': xxxScrolledWindow,
'wxBoxSizer': xxxBoxSizer,
'wxStaticBoxSizer': xxxStaticBoxSizer,
'wxGridSizer': xxxGridSizer,
'wxFlexGridSizer': xxxFlexGridSizer,
'wxGridBagSizer': xxxGridBagSizer,
'wxStdDialogButtonSizer': xxxStdDialogButtonSizer,
'sizeritem': xxxSizerItem, 'button': xxxSizerItemButton,
'spacer': xxxSpacer,
'wxMenuBar': xxxMenuBar,
'wxMenu': xxxMenu,
'wxMenuItem': xxxMenuItem,
'separator': xxxSeparator,
'unknown': xxxUnknown,
}
# Create IDs for all parameters of all classes
paramIDs = {'fg': wxNewId(), 'bg': wxNewId(), 'exstyle': wxNewId(), 'font': wxNewId(),
'enabled': wxNewId(), 'focused': wxNewId(), 'hidden': wxNewId(),
'tooltip': wxNewId(), 'encoding': wxNewId(),
'cellpos': wxNewId(), 'cellspan': wxNewId()
}
for cl in xxxDict.values():
if cl.allParams:
for param in cl.allParams + cl.paramDict.keys():
if not paramIDs.has_key(param):
paramIDs[param] = wxNewId()
################################################################################
# Helper functions
# Test for object elements
def IsObject(node):
return node.nodeType == minidom.Node.ELEMENT_NODE and node.tagName == 'object'
# Make XXX object from some DOM object, selecting correct class
def MakeXXXFromDOM(parent, element):
try:
klass = xxxDict[element.getAttribute('class')]
except KeyError:
# If we encounter a weird class, use unknown template
print 'WARNING: unsupported class:', element.getAttribute('class')
klass = xxxUnknown
return klass(parent, element)
# Make empty DOM element
def MakeEmptyDOM(className):
elem = g.tree.dom.createElement('object')
elem.setAttribute('class', className)
# Set required and default parameters
xxxClass = xxxDict[className]
defaultNotRequired = filter(lambda x, l=xxxClass.required: x not in l,
xxxClass.default.keys())
for param in xxxClass.required + defaultNotRequired:
textElem = g.tree.dom.createElement(param)
try:
textNode = g.tree.dom.createTextNode(xxxClass.default[param])
except KeyError:
textNode = g.tree.dom.createTextNode('')
textElem.appendChild(textNode)
elem.appendChild(textElem)
return elem
# Make empty XXX object
def MakeEmptyXXX(parent, className):
# Make corresponding DOM object first
elem = MakeEmptyDOM(className)
# If parent is a sizer, we should create sizeritem object, except for spacers
if parent:
if parent.isSizer and className != 'spacer':
sizerItemElem = MakeEmptyDOM(parent.itemTag)
sizerItemElem.appendChild(elem)
elem = sizerItemElem
elif isinstance(parent, xxxNotebook):
pageElem = MakeEmptyDOM('notebookpage')
pageElem.appendChild(elem)
elem = pageElem
# Now just make object
return MakeXXXFromDOM(parent, elem)